diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1018b218d77a..7de0438bbc76 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 0a73e8b17220..2dcee2132bba 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest
index 45c9e0c1f8b6..324c2f1d531e 100644
--- a/app-antivirus/fangfrisch/Manifest
+++ b/app-antivirus/fangfrisch/Manifest
@@ -1 +1,2 @@
 DIST fangfrisch-1.2.0.tar.gz 113088 BLAKE2B 9fb5f4b838e6337128c9e988f5749864cadacb74c9e3006f29cf8b976592af88c00ff5359cd70e4d6901e24cfc01b061861b7b1a563a82d66b2d71c970627c26 SHA512 6f6c0cfc4d840f99186c83e6109c6234ff5bfb44e19bcd3309056347392e46da56e17106259508864b05397d39ea92500ab6863b50d55efc790d88b59f88ee3b
+DIST fangfrisch-1.3.0.tar.gz 114361 BLAKE2B eca124f02f814d2915c4dbba45b6e4dc620e250730a32b34d3f5f5eaa33945e697d2d887f29251f1f8a3b1813476a54092091235a786e84695a3bc1cadebad28 SHA512 9c138737908a02efa5c9b4c6792a31e2a4908f8ab27e8cecab78612f812ab151afef75a405f47695779a949485aa88a3a5830efd02344ec334e6f37425cffe49
diff --git a/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild
new file mode 100644
index 000000000000..5de7fdc59bbd
--- /dev/null
+++ b/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Update and verify unofficial Clam Anti-Virus signatures"
+HOMEPAGE="https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/"
+SRC_URI="https://github.com/rseichter/fangfrisch/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+MY_CONF="/etc/${PN}.conf"
+MY_DBDIR="/var/lib/${PN}"
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="See https://rseichter.github.io/fangfrisch/ for the official
+documentation.
+
+### Fresh installations:
+
+Modify ${MY_CONF} according to your preferences.
+Assuming you place the database into ${MY_DBDIR}
+(recommended), execute the following commands in a root shell:
+
+mkdir -m 0770 ${MY_DBDIR}
+chgrp clamav ${MY_DBDIR}
+sudo -u clamav -- fangfrisch -c ${MY_CONF} initdb
+
+You can now enable /etc/cron.d/${PN} for periodic updates.
+
+### Alternative: Updating from release 1.0.1:
+
+Either create a fresh database or manually delete all existing
+database tables, then run the initdb command as shown above."
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i -e '/SQLAlchemy/d' setup.py || die
+	# Due to the nature of Fangfrisch, most tests require network
+	# connectivity. Upstream CI reports show that the tests are
+	# successful, so instead of a pick-and-choose approach, the
+	# complete tests directory is removed in this ebuild.
+	if [ -d tests ]; then
+		rm -r tests || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+	insinto /etc/cron.d
+	newins "${FILESDIR}/${PN}.cron" ${PN}
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	FORCE_PRINT_ELOG=1 readme.gentoo_print_elog
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e0d0ae308a8..ae59ca783adf 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 31f690766ecf..7149e334d2a6 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1 +1 @@
-DIST acme.sh-2.8.7.tar.gz 206475 BLAKE2B ac1d51efac6301210ffd8b6e5ff6ed490cbf80e7dd154ec7a2ad0b6a2dd08ac73a325e332192214c964a873ba7c6f01a43a2157963d7edec9e0ec45b47e5b689 SHA512 45599f50a4a45b6fdea58d7a5759e4eb5f8e33acc53d60b264c15662e6bdc1e353af610845056fc67b127242c4ad15eaaf60a2113f2cb0245d4e4861dac6e1c3
+DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
diff --git a/app-crypt/acme-sh/acme-sh-2.8.7.ebuild b/app-crypt/acme-sh/acme-sh-2.8.8.ebuild
similarity index 100%
rename from app-crypt/acme-sh/acme-sh-2.8.7.ebuild
rename to app-crypt/acme-sh/acme-sh-2.8.8.ebuild
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
index 7efc46cc6b71..51007c547ca8 100644
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 35f3cfc54270..f2f6f27db59e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
similarity index 97%
rename from app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
rename to app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
index b710d1bb40cd..5a5962cae494 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info pam systemd toolchain-funcs
+inherit autotools linux-info pam systemd
 
 DESCRIPTION="Opensourced tools for VMware guests"
 HOMEPAGE="https://github.com/vmware/open-vm-tools"
@@ -39,7 +39,7 @@ RDEPEND="
 		x11-libs/libXtst
 		x11-libs/libSM
 		x11-libs/libXcomposite
-		x11-libs/gdk-pixbuf:2
+		x11-libs/gdk-pixbuf-xlib
 		x11-libs/gtk+:3
 		gtkmm? (
 			dev-cpp/gtkmm:3.0
diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch
new file mode 100644
index 000000000000..168d7c24f5a3
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch
@@ -0,0 +1,96 @@
+Index: vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+===================================================================
+--- a/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
++++ b/vboxdrv/r0drv/linux/memobj-r0drv-linux.c
+@@ -56,9 +56,12 @@
+  * Whether we use alloc_vm_area (3.2+) for executable memory.
+  * This is a must for 5.8+, but we enable it all the way back to 3.2.x for
+  * better W^R compliance (fExecutable flag). */
+-#if RTLNX_VER_MIN(3,2,0) || defined(DOXYGEN_RUNNING)
++#if RTLNX_VER_RANGE(3,2,0, 5,10,0) || defined(DOXYGEN_RUNNING)
+ # define IPRT_USE_ALLOC_VM_AREA_FOR_EXEC
+ #endif
++#if RTLNX_VER_MIN(5,10,0) || defined(DOXYGEN_RUNNING)
++# define IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
++#endif
+ 
+ /*
+  * 2.6.29+ kernels don't work with remap_pfn_range() anymore because
+@@ -502,7 +505,43 @@
+ }
+ 
+ 
++#ifdef IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC
+ /**
++ * User data passed to the apply_to_page_range() callback.
++ */
++typedef struct LNXAPPLYPGRANGE
++{
++    /** Pointer to the memory object. */
++    PRTR0MEMOBJLNX pMemLnx;
++    /** The page protection flags to apply. */
++    pgprot_t       fPg;
++} LNXAPPLYPGRANGE;
++/** Pointer to the user data. */
++typedef LNXAPPLYPGRANGE *PLNXAPPLYPGRANGE;
++/** Pointer to the const user data. */
++typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE;
++
++/**
++ * Callback called in apply_to_page_range().
++ *
++ * @returns Linux status code.
++ * @param   pPte                Pointer to the page table entry for the given address.
++ * @param   uAddr               The address to apply the new protection to.
++ * @param   pvUser              The opaque user data.
++ */
++static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser)
++{
++    PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser;
++    PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx;
++    uint32_t idxPg = (uAddr - (unsigned long)pMemLnx->Core.pv) >> PAGE_SHIFT;
++
++    set_pte(pPte, mk_pte(pMemLnx->apPages[idxPg], pArgs->fPg));
++    return 0;
++}
++#endif
++
++
++/**
+  * Maps the allocation into ring-0.
+  *
+  * This will update the RTR0MEMOBJLNX::Core.pv and RTR0MEMOBJ::fMappedToRing0 members.
+@@ -584,6 +623,11 @@
+         else
+ # endif
+         {
++#  if defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
++            if (fExecutable)
++                pgprot_val(fPg) |= _PAGE_NX; /* Uses RTR0MemObjProtect to clear NX when memory ready, W^X fashion. */
++#  endif
++
+ # ifdef VM_MAP
+             pMemLnx->Core.pv = vmap(&pMemLnx->apPages[0], pMemLnx->cPages, VM_MAP, fPg);
+ # else
+@@ -1851,6 +1895,21 @@
+         preempt_enable();
+         return VINF_SUCCESS;
+     }
++# elif defined(IPRT_USE_APPLY_TO_PAGE_RANGE_FOR_EXEC)
++    PRTR0MEMOBJLNX pMemLnx = (PRTR0MEMOBJLNX)pMem;
++    if (   pMemLnx->fExecutable
++        && pMemLnx->fMappedToRing0)
++    {
++        LNXAPPLYPGRANGE Args;
++        Args.pMemLnx = pMemLnx;
++        Args.fPg = rtR0MemObjLinuxConvertProt(fProt, true /*fKernel*/);
++        int rcLnx = apply_to_page_range(current->active_mm, (unsigned long)pMemLnx->Core.pv + offSub, cbSub,
++                                        rtR0MemObjLinuxApplyPageRange, (void *)&Args);
++        if (rcLnx)
++            return VERR_NOT_SUPPORTED;
++
++        return VINF_SUCCESS;
++    }
+ # endif
+ 
+     NOREF(pMem);
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
index 29faf7632fd4..28c26bd6c0c9 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
@@ -29,6 +29,10 @@ MODULESD_VBOXDRV_ENABLED="yes"
 MODULESD_VBOXNETADP_ENABLED="no"
 MODULESD_VBOXNETFLT_ENABLED="no"
 
+PATCHES=(
+	"${FILESDIR}/${P}-linux-5.10-r0drv-memobj-fix-r0.patch" #751328
+)
+
 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 ff22938997e1..03d0c52f9865 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 0475509dd8e5..9034070f8264 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,4 +1,6 @@
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
 DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
+DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
new file mode 100644
index 000000000000..5a9c6f7d4b4f
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+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 ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="app-misc/c_rehash
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
new file mode 100644
index 000000000000..9a1f22519818
--- /dev/null
+++ b/app-misc/piper/Manifest
@@ -0,0 +1 @@
+DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
diff --git a/app-misc/piper/metadata.xml b/app-misc/piper/metadata.xml
new file mode 100644
index 000000000000..293e65b38d2b
--- /dev/null
+++ b/app-misc/piper/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alex@1stleg.com</email>
+    <name>Alex Barker</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+    <description>Proxy maintainer for Alex</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">libratbag/piper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-misc/piper/piper-0.5.1.ebuild b/app-misc/piper/piper-0.5.1.ebuild
new file mode 100644
index 000000000000..33eae628b921
--- /dev/null
+++ b/app-misc/piper/piper-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# 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 meson python-single-r1 udev
+
+DESCRIPTION="GTK configuration application for libratbag"
+HOMEPAGE="https://github.com/libratbag/piper"
+SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	>=dev-libs/libratbag-0.13
+	gnome-base/librsvg[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libevdev
+	virtual/libudev
+"
+
+src_configure() {
+	python_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5092b57504a1..d6d435f9f2e7 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 05976aafbfaa..60739ab8ad05 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,2 +1 @@
-DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
deleted file mode 100644
index 0afc4dcd9ef7..000000000000
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converter to generate console fonts from BDF source fonts"
-HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
-SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/console-setup-${PV}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin Fonts/bdf2psf
-
-	insinto usr/share/bdf2psf
-	doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
-
-	doman man/bdf2psf.1
-	dodoc debian/README.fontsets
-}
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
new file mode 100644
index 000000000000..9d7f53e2fd1f
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
@@ -0,0 +1,16 @@
+https://bugs.ghostscript.com/show_bug.cgi?id=703270
+
+--- a/lib/ps2epsi
++++ b/lib/ps2epsi
+@@ -40,8 +40,8 @@ else
+ 	outfile=$2
+ fi
+ 
+-# Note, we expect 'ps2epsi.ps' to be in the same directory as 'ps2epsi'
++# Note, we expect 'ps2epsi.ps' to be on one of the search paths which can be seen by: gs -h
+ "$GS_EXECUTABLE" -q -dNOOUTERSAVE -dNODISPLAY -dLastPage=1 -sOutputFile="${outfile}" \
+-		--permit-file-all="${infile}" -- "$LIBDIR/ps2epsi.ps"  "${infile}" 1>&2
++		--permit-file-all="${infile}" -- ps2epsi.ps  "${infile}" 1>&2
+ 
+ exit 0
+ 
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
similarity index 95%
rename from app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
rename to app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 3e43e96c815f..e4d3e176be9e 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -61,8 +61,8 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	# bug #747808
-	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch"
+	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" # bug #747808
+	"${FILESDIR}/${P}-fix-ps2epsi.patch"
 )
 
 src_prepare() {
@@ -107,7 +107,7 @@ src_prepare() {
 
 	# search path fix
 	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
 		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
 		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
@@ -183,7 +183,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
 
 	if ! use static-libs; then
 		find "${ED}" -name '*.la' -delete || die
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 530dda183ad5..c5fb5a2862b9 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 6f23811e6c78..ff8bbbe77fc6 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,4 +1,2 @@
-DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6b9d754770bd94f9482e4e444a4bc4d44a8317376a6c374bb7363eae96a49281fefd95dd663134087123034b SHA512 546743376380d84aa9c8be65529dbbe1634e574203220ce1c057341436bd3a15297f393ca79d29372cb125bf457cfc00f64ba2867b8d2e910ca6531acb552e97
-DIST scdoc-1.10.1.tar.gz 12422 BLAKE2B 4aa5b28994cd03f5d3fc9fff253a02f1052653d25d41225665219ebb6322ebe69f2671d91c5cfe201fd7f9b1ac06f38db3dd126492da06fef0b692fc040300d5 SHA512 356aee85c4676a1fbd7367c6087dd7f6f4d33793be0f3fef74803ceb93c0a9e45c78022d219dc08a7d79d71c393849fa3113c36a85d5d60ed474b62bf5f89743
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
-DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
+DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
diff --git a/app-text/scdoc/scdoc-1.10.0.ebuild b/app-text/scdoc/scdoc-1.10.0.ebuild
deleted file mode 100644
index 9460e30e3a9a..000000000000
--- a/app-text/scdoc/scdoc-1.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
-	inherit git-r3
-else
-	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	sed -e 's/-Werror//' \
-		-i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
-	local MY_HS="./scdoc"
-	if tc-is-cross-compiler; then
-		tc-export_build_env
-		MY_HS="./hostscdoc"
-		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
-		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
-	fi
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/app-text/scdoc/scdoc-1.10.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
similarity index 100%
rename from app-text/scdoc/scdoc-1.10.1.ebuild
rename to app-text/scdoc/scdoc-1.11.1.ebuild
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
deleted file mode 100644
index 88d71fc2d038..000000000000
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
-	inherit git-r3
-else
-	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	sed -e 's/-Werror//' \
-		-i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
-	local MY_HS="./scdoc"
-	if tc-is-cross-compiler; then
-		tc-export_build_env
-		MY_HS="./hostscdoc"
-		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
-		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
-	fi
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 14add61ed683..7dbc0d8007fe 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 3f46b99e0250..a412a3a8629e 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,4 @@
 DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
 DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
 DIST eigen-3.3.8.tar.gz 2141903 BLAKE2B c33e699ba08338e7b9b215c9466e161229164ed3c466ce3d760c6917749af33c0414c3bc4bbdd216e3466e69ece8a38ca8beb78b7e0f1609894df6bb4a7fcca3 SHA512 5b4b5985b0294e07b3ed1155720cbbfea322fe9ccad0fc8b0a10060b136a9169a15d5b9cb7a434470cadd45dff0a43049edc20d2e1070005481a120212edc355
+DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
new file mode 100644
index 000000000000..27c31cc35507
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="test"
+inherit cmake cuda fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
+SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	test? ( virtual/pkgconfig )
+"
+DEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc[sparse]
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		sci-libs/umfpack
+		virtual/opengl
+	)
+"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
+	"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
+	# disable the cholmod tests, they always fail
+	"${FILESDIR}"/${PN}-3.3.9-disable-cholmod_support.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	cmake_comment_add_subdirectory demos
+
+	if ! use test; then
+		sed -e "/add_subdirectory(test/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(blas/s/^/#DONOTCOMPILE /g" \
+			-e "/add_subdirectory(lapack/s/^/#DONOTCOMPILE /g" \
+			-i CMakeLists.txt || die
+	fi
+
+	use cuda && cuda_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKEPACKAGE_INSTALL_DIR=$(get_libdir)/cmake/${PN}${SLOT}
+	)
+	use test && mycmakeargs+=(
+		# the OpenGL testsuite is extremely brittle, bug #712808
+		-DEIGEN_TEST_NO_OPENGL=ON
+		-DEIGEN_TEST_CXX11=ON
+		-DEIGEN_TEST_NOQT=ON
+		-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
+		-DEIGEN_TEST_CUDA=$(usex cuda)
+		-DEIGEN_TEST_OPENMP=$(usex openmp)
+		-DEIGEN_TEST_NEON64=$(usex cpu_flags_arm_neon)
+		-DEIGEN_TEST_VSX=$(usex cpu_flags_ppc_vsx)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+	if use test; then
+		cmake_src_compile blas
+		cmake_src_compile buildtests
+
+		# tests generate random data, which
+		# obviously fails for some seeds
+		export EIGEN_SEED=712808
+	fi
+}
diff --git a/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch b/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch
new file mode 100644
index 000000000000..e3b9db5a1707
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch
@@ -0,0 +1,20 @@
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -46,16 +46,7 @@
+ 
+ set(SPARSE_LIBS " ")
+ 
+-find_package(Cholmod)
+-if(CHOLMOD_FOUND)
+-  add_definitions("-DEIGEN_CHOLMOD_SUPPORT")
+-  include_directories(${CHOLMOD_INCLUDES})
+-  set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES})
+-  set(CHOLMOD_ALL_LIBS  ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES})
+-  ei_add_property(EIGEN_TESTED_BACKENDS "Cholmod, ")
+-else()
+-  ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ")
+-endif()
++ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ")
+ 
+ find_package(Umfpack)
+ if(UMFPACK_FOUND)
diff --git a/dev-cpp/eigen/files/eigen-3.3.9-max-macro.patch b/dev-cpp/eigen/files/eigen-3.3.9-max-macro.patch
new file mode 100644
index 000000000000..c5fdc2ed582c
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.3.9-max-macro.patch
@@ -0,0 +1,17 @@
+--- a/unsupported/test/forward_adolc.cpp
++++ b/unsupported/test/forward_adolc.cpp
+@@ -7,12 +7,13 @@
+ // Public License v. 2.0. If a copy of the MPL was not distributed
+ // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-#include "main.h"
+ #include <Eigen/Dense>
+ 
+ #define NUMBER_DIRECTIONS 16
+ #include <unsupported/Eigen/AdolcForward>
+ 
++#include "main.h"
++
+ template<typename Vector>
+ EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p)
+ {
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 62753198cf07..1724cd068df0 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index e29caef56709..781173b77940 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -1,2 +1,4 @@
 DIST rpi-eeprom_10.2-1.debian.tar.xz 7360 BLAKE2B e7959c4de4f3675632f0897b6f8abc811c80daa102ad3fcca672a0e0f9ce4b4da80fd616de7aa8896f0f5fe889a10a52d32eba34627858a173186292175f3bf9 SHA512 cf401c5f761fc8c5b463630d192c8af9da2ae2e55e178857d9c09198437f162f96af23836d20adda6054243c6b613b7cc5c90a70975b96bad574dc3b328caa22
 DIST rpi-eeprom_10.2.orig.tar.gz 7415652 BLAKE2B b1f56263c0037b2ba3bac2aecd9b5736736cf599bc68a743c065c853a20f56f18984816fdfb402bb499c3aa911dbe72376cec4647d87406cce2f4328b04cc2b1 SHA512 ea76a157ed57984fb0667e9171e3fbf7dba180e014faa9352b0c1904531dca9528b0e3204645a4af2b550670a52354b6b1be6af27e190d4523d8044f3349aa73
+DIST rpi-eeprom_10.3-1.debian.tar.xz 10188 BLAKE2B 284a5465f2b5bc28c95135b8869218e83cbea9d0667b165de954f5c73549dfc190ddc838d956eec4c569c579e95ffc157054c6ed4bbd45e8ae88f786675cb164 SHA512 ead6b6c51d03493479c242e757edfc33bfdba4627f7501d90d0a181e8adc68f1503e0dac900b9b253a7286523f84d0e9afd8460d72f30b3ee8ee75b2f76811ab
+DIST rpi-eeprom_10.3.orig.tar.gz 7635402 BLAKE2B 3153eda08eada4c9e4f05d7a68ac4661413591314c4980e16ee876d49e756e2e13a101765b579adbe51e0e3b88cdfe419b71a58da858250781e0f292220dc397 SHA512 ea5a6ae47be5052b4793161d891a1e3a72dda951c95f15797d7baf68d475fcec1250638e4c43a32578ceef10563ebce052e746bc8fc60f8cf8d90780d5a7e8a7
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild
new file mode 100644
index 000000000000..c34a558630a7
--- /dev/null
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-r1 systemd
+
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
+MY_P="${PN}-$(ver_cut 1-2)"
+MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
+SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
+	${MY_BASE_URL}.orig.tar.gz"
+S="${WORKDIR}"
+
+SLOT="0"
+LICENSE="BSD rpi-eeprom"
+KEYWORDS="~arm ~arm64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/flashrom
+	|| (
+		>=media-libs/raspberrypi-userland-0_pre20201022
+		>=media-libs/raspberrypi-userland-bin-1.20201022
+	)"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
+		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
+	sed -i \
+		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
+		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
+}
+
+src_install() {
+	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
+
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
+
+	dosbin rpi-eeprom-update
+	keepdir /var/lib/raspberrypi/bootloader/backup
+
+	for dir in critical stable beta; do
+		insinto /lib/firmware/raspberrypi/bootloader
+		doins -r firmware/${dir}
+	done
+
+	dodoc firmware/release-notes.md
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
+		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
+			up-to-date and updates the EEPROM" \
+		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
+
+	doman rpi-eeprom-update.1 rpi-eeprom-config.1
+
+	newconfd rpi-eeprom-update-default rpi-eeprom-update
+
+	popd 1>/dev/null || die
+
+	pushd debian 1>/dev/null || die "Cannot change into directory debian"
+
+	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
+	newdoc changelog changelog.Debian
+
+	popd 1>/dev/null || die
+
+	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
+}
+
+pkg_postinst() {
+	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
+	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
+	elog 'or'
+	elog 'rpi-eeprom-update.service (for systemd users)'
+	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
+	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
+	elog 'which release track you get. "critical" is recommended and the default.'
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 5f002f5b5698..33ec1403c1f6 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.6.ebuild
index 553ea56cb38e..a7adcec857d8 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.6.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +distributive,+containers
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,25 +16,25 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
+IUSE="+test-doctests"
 
 RESTRICT=test # broken on USE=doc
 
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+	>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
 	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
-	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 ) )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag distributive distributive) \
+		--flag=containers \
+		--flag=distributive \
 		$(cabal_flag test-doctests test-doctests)
 }
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 6dc7bb65e52c..f27d2907afb4 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,22 +6,6 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="test-doctests">
-			Run the doctests test suite
-		</flag>
-		<flag name="containers">
-			You can disable the use of the `containers` package
-			using `-f-containers`. Disabing this is an unsupported configuration, but it
-			may be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="distributive">
-			You can disable the use of the `distributive`
-			package using `-f-distributive`. Disabling this is an unsupported
-			configuration, but it may be useful for accelerating builds in sandboxes for
-			expert users. If disabled we will not supply instances of `Distributive`
-		</flag>
+		<flag name="test-doctests">Run the doctests test suite</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/comonad</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
similarity index 91%
rename from dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild
rename to dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
index b122e00e7f0c..d29aea060d12 100644
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
 	>=dev-haskell/unix-compat-0.2:=[profile?]
 	>=dev-haskell/unordered-containers-0.2:=[profile?]
 	>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
-	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
+	>=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?]
 	>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
@@ -44,6 +44,13 @@ DEPEND="${RDEPEND}
 		dev-haskell/temporary )
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'wai-extra                 >= 3.0      && < 3.1' 'wai-extra                 >= 3.0'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag print print)
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 098458f7b5dc..83fc723e2f31 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -1 +1 @@
-DIST wai-extra-3.0.31.tar.gz 63975 BLAKE2B e705142e48bac00d13d9ec42ecc02a646a081e69a5996794db34bea77b193dccfe9de2f9b89518b234adf226cfc79765c1d8eabcf7c990494e0d206f6a8de080 SHA512 71635f9acc44ffd19b76d7f1a5e43fa079dffe6e447be1c9df4b491cf96c226346788eb773923cf702d44d4620f2a5e7478be1c625b4c2332b9bed7e6e5391d2
+DIST wai-extra-3.1.4.1.tar.gz 67063 BLAKE2B d75f1425cf4c75596adb65c152c954a6005b085f3a290d7dea279a4417d85e359f6948fc8282cee63f2057b4dfe3e33b7a364667544c925582024e4255e71462 SHA512 c33b513bd6e627361007f285167235535ac4065e7198749c14d05cfcd89c5017b54896064c64ffdda9875d6363b684b9beed4098fdbefaba1058045ba3245af5
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
similarity index 93%
rename from dev-haskell/wai-extra/wai-extra-3.0.31.ebuild
rename to dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
index c4c729cde5bb..c923228ad142 100644
--- a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/fast-logger-2.4.5:=[profile?]
 	>=dev-haskell/http-types-0.7:=[profile?]
 	dev-haskell/http2:=[profile?]
+	dev-haskell/hunit:=[profile?]
 	dev-haskell/iproute:=[profile?]
 	>=dev-haskell/network-2.6.1.0:=[profile?]
 	>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
@@ -41,13 +42,12 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/wai-logger-2.3.2:=[profile?]
 	dev-haskell/word8:=[profile?]
 	dev-haskell/zlib:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.2.1:=
 	examples? ( dev-haskell/warp:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( >=dev-haskell/hspec-1.3
-		dev-haskell/hunit )
+	>=dev-haskell/cabal-2.0.0.2
+	test? ( >=dev-haskell/hspec-1.3 )
 "
 
 src_configure() {
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 7a6daa51ab59..5702a1c1f6ff 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1 +1 @@
-DIST yesod-core-1.6.18.7.tar.gz 100141 BLAKE2B 0d00fffcc4371868f02ec5ec1fe4f5af15369f62b7bf88562e8c092b3988824cbbe26defd574f2514d23fca983f81cc951b75f564213f568d244069e352cc198 SHA512 fde155df74588d2eb9824e0f423b666228a1b681a83c4f30e194c8816667cd6e4fefb7cddcd66f6ff2ca745ad3ef8daee439a133b017d8583167b54a698a12a1
+DIST yesod-core-1.6.18.8.tar.gz 100016 BLAKE2B 117535cc875be850011b357ebf3bb89e6d854870cefe26e20001e70b93247d85a3bd190e2f889626819f8bc80211b2c64b5d8dac7e9606229ed07c03d8926c2e SHA512 1774281bf8de190995360bcf461adc46b65bac5fa2200aada0b511f73b3bc7bab8365fa4737b4de4723481f7b76c0cb440d68b118c15c46e3d455ea9126bffa7
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
similarity index 100%
rename from dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild
rename to dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 98ddc61e284e..c54422da7570 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2-r1.ebuild
similarity index 95%
rename from dev-java/antlr/antlr-3.5.2.ebuild
rename to dev-java/antlr/antlr-3.5.2-r1.ebuild
index 43986264fbcd..72eaa9b7c8be 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit eutils java-pkg-2 java-pkg-simple
 
@@ -18,21 +18,26 @@ RESTRICT="!test? ( test )"
 CDEPEND="dev-java/stringtemplate:4"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.8
 	test? ( dev-java/junit:4 )"
 
 S="${WORKDIR}/${PN}3-${PV}"
 JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
 JAVA_GENTOO_CLASSPATH="stringtemplate-4"
+PATCHES=(
+	"${FILESDIR}/${PV}-test-fixes.patch"
+)
 
 src_unpack() {
 	unpack ${P}.tar.gz
 }
 
-java_prepare() {
+src_prepare() {
+	default
+
 	java-pkg_clean
 
 	# This requires StringTemplate v3 and is only needed for
@@ -42,7 +47,6 @@ java_prepare() {
 
 	# Some tests have to be removed as a result.
 	rm -v tool/src/test/java/org/antlr/test/Test{RewriteTemplates,Templates}.java || die
-	epatch "${FILESDIR}/${PV}-test-fixes.patch"
 
 	# Some tests fail under Java 8 in ways that probably aren't limited
 	# to the tests. This is bad but upstream is never going to update
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0d72da80653a..a79aaaf3fa04 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/php/php-7.2.33.ebuild b/dev-lang/php/php-7.2.33.ebuild
index 20ab7418c2ad..07f0645b8d80 100644
--- a/dev-lang/php/php-7.2.33.ebuild
+++ b/dev-lang/php/php-7.2.33.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.2.34.ebuild b/dev-lang/php/php-7.2.34.ebuild
index 20ab7418c2ad..07f0645b8d80 100644
--- a/dev-lang/php/php-7.2.34.ebuild
+++ b/dev-lang/php/php-7.2.34.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.21.ebuild b/dev-lang/php/php-7.3.21.ebuild
index 4583dedfe50e..9c97e02a635a 100644
--- a/dev-lang/php/php-7.3.21.ebuild
+++ b/dev-lang/php/php-7.3.21.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.3.23.ebuild b/dev-lang/php/php-7.3.23.ebuild
index 4583dedfe50e..9c97e02a635a 100644
--- a/dev-lang/php/php-7.3.23.ebuild
+++ b/dev-lang/php/php-7.3.23.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.11.ebuild b/dev-lang/php/php-7.4.11.ebuild
index b7203bdf290c..de0cec9f7020 100644
--- a/dev-lang/php/php-7.4.11.ebuild
+++ b/dev-lang/php/php-7.4.11.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.9.ebuild b/dev-lang/php/php-7.4.9.ebuild
index b7203bdf290c..de0cec9f7020 100644
--- a/dev-lang/php/php-7.4.9.ebuild
+++ b/dev-lang/php/php-7.4.9.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d49d977a4a0e..1d47d37b9e01 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,5 +1,6 @@
 DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
 DIST Python-3.10.0a1.tar.xz 18571152 BLAKE2B d74e467dfce1a0e3374377fc36865f1059e3810f67492608bbcfdb6880fc9a748ed19d1e3c4617a9218c842e8e9cb4119845eccb6848acae9b4af389cbbdb43a SHA512 eb1a0f6dd023efe67cfc2c833b0a7d390765d288e4da7aae932ba66b970d63ad377dbe48ddf0548c5cca5334a3aa1c7e92f972b68c54e4238ea1f3610adb8910
+DIST Python-3.10.0a3.tar.xz 18676916 BLAKE2B 86c8e3cd5d9658a2b1027558eda42294807173cac39010737dba6a0bf75a3a7211297cb79061085ab0cea52eaaba521140ff67c3b6edeebd677429191f4435b5 SHA512 a361c04081e9bd7e740c3311d92ec1428f12c589613ab39ed2bb1ac5aa20e4d8bc6d6e76eefc20edd459ecf8be1720f3985126be38407fcfb41f5a6efcea3998
 DIST Python-3.6.11.tar.xz 17213036 BLAKE2B 4dae9d9c5eb7e97a8990b0b5739d40ba8a85081c7e03adc22a3305e713d39b3a98ff66c17b395b9d45355e124307eed87803211378d14360e8b3455f7146a1ba SHA512 c76969a6602e095641ba5fd0999a47cf0187eb26559ba9a6e80fe401b8928f6cd9eabd963f615f7c667e48f56603f2508d2b5692c83ea8da1e21292131fb11d6
 DIST Python-3.6.12.tar.xz 17202980 BLAKE2B c8d22e4d57bcaffe77cd902cda3a473e73adf2b74ab104c23b4d846f19632a24cc0c478af84079b16d784bd1c0956824c06c1f6134fd24f54e58aaab0fe96bb6 SHA512 1462801f3f6626a853097d34ccdca9838c4c5bd81ecc3abc751003f5f2f8d36eecdaa4130ef4218de351c5586093c11669639a34492668fbc5a2a4a241f4a070
 DIST Python-3.7.8.tar.xz 17399552 BLAKE2B 4bf6c47b1132b6d31a79232002c4d38e2cd123ac05d52b21d6bfba5a4e19ec9130b8df8698d5ce6627e4297c4cf756643f036e694e36364c235306c72ef34bf8 SHA512 d2ba299e3cf8ed0f8fed9317f42bcd8d9af7e0e6175939b4be1be289c1658418bed17899e2608d762ffb15575021956cf6bf2054d7863c04b3bd7642f5b8c7ea
@@ -7,14 +8,21 @@ DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1
 DIST Python-3.8.4.tar.xz 18020412 BLAKE2B cfcfb293c413b25fc3ca48116cf8ffaba7bee18e9af9accf26be9b4373a0c62dd8e9da70e5a8a38ba6da4d1afbdbd589ae5ea4b618b65130ae061698b445908c SHA512 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb
 DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
 DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
+DIST Python-3.8.7rc1.tar.xz 18258688 BLAKE2B cd18abf3a2f97856581735fc6ab98882c3839edd84f736b2f681a227694319f410154201e5e09938ec45ba00b69a593737da22263560080da72625f8611f14c6 SHA512 0c42622433b968dc0943894bff6e90603bdfc4e49ab4373e2686a158e1d4b3450e60aa16d8203ce3d0e0e8bb0ebcaad281ccd7eb03b355eeeb7c811a4cd799ec
 DIST Python-3.9.0.tar.xz 18866140 BLAKE2B 8e12b64e187a65461473ac3b281dc489f0abac586e0755f6dbeceb236b34bdc008085eeac9ee1a19d76f5ec6a2fbda623985454c9d0164c4888a97b8cd940034 SHA512 b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e
+DIST Python-3.9.1.tar.xz 18897104 BLAKE2B bcbce176510e8e7c6ba6070588bedc52121c21c5271f59b3d629dfb542c51ee62622b2ca53a6e2041f1a51b2d089368cc4de9bb749e8ebad9a2c4eb4de83538e SHA512 b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019
 DIST python-gentoo-patches-2.7.18-r3.tar.xz 18856 BLAKE2B e35b3d847dad114057b7dab7615941b4879f3531aff1d23bced22da2d445cdec77cdd416566611ca01a3d39f30f16ef224f835f35ca12a301024d7a9fb6a507b SHA512 abb102223555535d5214fa91fd4bb3d1241050c86027af1612a9bd43fea2721e184587e5b784e5af9cbf563b8fec5a25cd07dc5fa72d762228734713176cfcbd
+DIST python-gentoo-patches-2.7.18-r4.tar.xz 21352 BLAKE2B d322f5afd63813d7c9280c75f942bde75ee19793e121d0406c4f229ead53324bf3996342eed9a6c1aa474894afe7f2dd70aec38aee8042993a5274abc288fd31 SHA512 1cb0be8e79d0c6c55fcbe3f3dabf8b760aea0e60d888ea39d3e69de03b55738c50b2cca06586c1cd2896956f5764eefd6d3f9fbf2de0d0ddfd8aab86837976b6
 DIST python-gentoo-patches-3.10.0a1.tar.xz 8592 BLAKE2B 066fe89725469649a88a0b0c9f62d7d1380feb704ed12c696871cd595e4e920f23b54a2c771e15b5d2345dcdab21694365ef9b29e93f552f74d13642ebc59200 SHA512 e86df9e08ec7306f6457b5e3490171966022964fb700046587088bceb3d8977a45fe7e944f7dd39ad473000654f69f495b8c67edebb13bc12000b32716845533
 DIST python-gentoo-patches-3.6.11-r3.tar.xz 14064 BLAKE2B 416780c15ee12cfc06bfd1397d510dd42fea61abcaafd9cf54f27d843342debf0caa93c9700686feb14f04239ad4ea8f20ce8736029638abe7d7b9c57b9d659d SHA512 de6a4a5bec89e6149b85b383991c99bd9460a8f59f52a700d54edd0154557727ccc79daaa90336dff434b222657c3f28dda1228d2d474002d0a28f31c9ed0b10
+DIST python-gentoo-patches-3.6.12-r1.tar.xz 16540 BLAKE2B 8204b6f25e1f7c6fef024933d54bfa6085158ac624a6e5a8d51576da2047b6db791be5d071c483fdec5c033b8fa8ee3d4e176a3e442defa556b34a304de3b7f3 SHA512 ad74c73b4f963427e66ac6187e1569dbfbbe3c916c24971a1eba4ad7e2f94e39c970f80e197c0498820451f036b12f3076b46cfd73bb5d6d56183ac05453d9ad
 DIST python-gentoo-patches-3.6.12.tar.xz 11448 BLAKE2B a7fb7153ca6fd353649f9dc23f2d777e84ff144d67984d8c3d292619a4f671e3a71d8022bcc334b55f9f1f416ceeca113fb116da805e4bc45d8a67cbc098ead8 SHA512 7efb97abd3e058e4532b89205c99794836ba094079de2a6d7846fd2673ea8cc31e68573b83fd9f82453151653fb0ed9bc40b7961b41efdfe703b64cbed2576bf
 DIST python-gentoo-patches-3.7.8-r3.tar.xz 13232 BLAKE2B 9df47b1f61d08f62a80221bc48d73ec27cd74a9ade8219912c5b02eaea919b70d91b1154837cd03c0129a5839186e9c970167ca3398129c044c25c7853f1f920 SHA512 e1477d425cb6125ca2286d816f4aa4e9e3c789d6a4f4907bd7b78549598356cae5766f642e2cad9e7c3abe2e82c12cf3cb7db3513be68aa213cb64cc0abc678a
+DIST python-gentoo-patches-3.7.9-r1.tar.xz 15664 BLAKE2B 271b95a52f4ba83c1aee6f68385462c9af8f2ab575267ac068a793e99f7c9739eb4b98dfa7e9280510a709557d418db04f26b5b31bbfe95dfdc13c1773510d2d SHA512 38df628de2f2835f975f6f06395d32cd63051af87b9bf8b06eef2f987bde26a883923bcab333568c122554b900bb17995a8c7290b6a58f942bd942dcbc70d030
 DIST python-gentoo-patches-3.7.9.tar.xz 10588 BLAKE2B f60c8500671e7e3977412474c838905846e0609a7fdac787f2c6a8bfa53c887dcfd3466c5276772ffb8c20205e8b3f207f7d148c04524f19d095964b519da62d SHA512 11f411eb2d59fd45fbd80bdb1d1a83d413770779244045006942c5cb84837cba606673bcde102ae03b1d4579f526b551c93a64d39dba530b4584ba8dd8e9f13e
 DIST python-gentoo-patches-3.8.4-r2.tar.xz 12660 BLAKE2B 3197edc6beb2b1be05399f268ff9b337ed67f699e3867160fea8e50f763a62b184ddd7adcdfa55dafc8c14f91e020b409461027361d04858db667992794b1168 SHA512 c56adbec04bfb950f7fb65f38cc0b78eaae9783800c755b7ac934b07725fcf4d69bbc2c29f7d1255acd6e88559a216dc8a6088042a479aa0d453b706e318c0cf
 DIST python-gentoo-patches-3.8.5.tar.xz 11280 BLAKE2B 163c577da75f4ec0ebe86b5a08bea96d5ae406020bd211439b1405c0f8a5dddc9422a9ea5b16eed195433cbec010d9def3126a578d3f9716325482216b9e4d62 SHA512 6b7f72b8deb87fb7a169e97391185823984b5e9c99ec5232504c670843fbe0ca76afe32fc3fbe1f850ec6c42e9325cf4697022f36f7b00a4028b324069dd4d5b
+DIST python-gentoo-patches-3.8.6-r1.tar.xz 15880 BLAKE2B 9a08cd23af56bcc2ed0dffe4850698be6e0bcf7c44d3eafeb250e328a93833dc3e9ce084f1be89450d1e123cd72d81c6271edfe34046d1bab3d7c10a98d0d9c5 SHA512 83474915cab0928d1d2f4229832bef7c093b2943770fa900a7445bfaa633544f50791aa8b4bc4191662af56feef166814d98eb6fad2c0a0eb9db1f8f4806e689
 DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0
+DIST python-gentoo-patches-3.9.0-r1.tar.xz 13728 BLAKE2B 50e85194c6bafefb8a0ddc4c9dea39227fc2c170db37ab44fa1e068340fa2fc5a59489f50431f0792024df551fc54a20de594579b57717c89fa134b3f000bb6d SHA512 a38c2800e3a0740af79f75f4120c925c7a891aa1f14a71ab56ad97fbabca3573c571140da3f34050bd9f97bd854a704453a910fa6883162196e6d1335a965b61
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild
new file mode 100644
index 000000000000..598e46e62900
--- /dev/null
+++ b/dev-lang/python/python-2.7.18-r5.ebuild
@@ -0,0 +1,369 @@
+# 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-2.7.18-r4"
+
+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}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# 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:=
+	dev-libs/libffi:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	berkdb? ( || (
+		sys-libs/db:5.3
+		sys-libs/db:5.1
+		sys-libs/db:4.8
+		sys-libs/db:4.7
+		sys-libs/db:4.6
+		sys-libs/db:4.5
+		sys-libs/db:4.4
+		sys-libs/db:4.3
+		sys-libs/db:4.2
+	) )
+	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 )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+	!<=dev-lang/python-exec-2.4.6-r1"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+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" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	# dbm module can be linked against berkdb or gdbm.
+	# Defaults to gdbm when both are enabled, #204343.
+	local disable
+	use berkdb    || use gdbm || disable+=" dbm"
+	use berkdb    || disable+=" _bsddb"
+	# 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
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	local myeconfargs=(
+		# The check is broken on clang, and gives false positive:
+		# https://bugs.gentoo.org/596798
+		# (upstream dropped this flag in 3.2a4 anyway)
+		ac_cv_opt_olimit_ok=no
+		# 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
+
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2")
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--with-system-expat
+		--with-system-ffi
+		--without-ensurepip
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	emake
+
+	# 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="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	# Daylight saving time problem
+	# https://bugs.python.org/issue22067
+	# https://bugs.gentoo.org/610628
+	local -x TZ=UTC
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /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/$(get_libdir)/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/$(get_libdir)/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
+	mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
+	mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
+	rm "${ED}/usr/bin/smtpd.py" || die
+
+	use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
+	use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		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 scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python
+	ln -s "../../../bin/python${PYVER}" \
+		"${scriptdir}/python" || die
+	# python-config
+	ln -s "../../../bin/python${PYVER}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+
+	# python2* is no longer wrapped, so just symlink it
+	local pymajor=${PYVER%.*}
+	dosym "python${PYVER}" "/usr/bin/python${pymajor}"
+	dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
+}
+
+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
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3.ebuild
new file mode 100644
index 000000000000..ea470a43ed9f
--- /dev/null
+++ b/dev-lang/python/python-3.10.0_alpha3.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_alpha/a}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-3.10.0a1"
+
+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}"
+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"
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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
+
+	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
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild
new file mode 100644
index 000000000000..435713142e9d
--- /dev/null
+++ b/dev-lang/python/python-3.6.12-r1.ebuild
@@ -0,0 +1,365 @@
+# 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 multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}-r1"
+
+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 ~s390 ~sparc x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads 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-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" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		configure.ac \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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."
+
+	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
+
+		--with-fpectl
+		--enable-shared
+		$(use_enable ipv6)
+		$(use_with threads)
+		--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[@]}"
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+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 faulthandler"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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/$(get_libdir)/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/$(get_libdir)/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 threads || rm -r "${libdir}/multiprocessing" || 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/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild
new file mode 100644
index 000000000000..9cfc01d878ff
--- /dev/null
+++ b/dev-lang/python/python-3.7.9-r1.ebuild
@@ -0,0 +1,351 @@
+# 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 multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}-r1"
+
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild
new file mode 100644
index 000000000000..739ad8e6a6a5
--- /dev/null
+++ b/dev-lang/python/python-3.8.6-r1.ebuild
@@ -0,0 +1,355 @@
+# 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 multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}-r1"
+
+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}"
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || 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/python/python-3.8.7_rc1.ebuild b/dev-lang/python/python-3.8.7_rc1.ebuild
new file mode 100644
index 000000000000..b60d4405e93e
--- /dev/null
+++ b/dev-lang/python/python-3.8.7_rc1.ebuild
@@ -0,0 +1,355 @@
+# 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 multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_rc/rc}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-3.8.6"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || 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/python/python-3.9.0-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild
new file mode 100644
index 000000000000..d6f0e8fd055b
--- /dev/null
+++ b/dev-lang/python/python-3.9.0-r1.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_/}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}-r1"
+
+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}"
+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"
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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
+
+	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
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/python/python-3.9.1.ebuild b/dev-lang/python/python-3.9.1.ebuild
new file mode 100644
index 000000000000..9f6b2edbb3a1
--- /dev/null
+++ b/dev-lang/python/python-3.9.1.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV/_/}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-3.9.0rc1"
+
+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}"
+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"
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+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@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	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
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	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=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		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
+
+	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
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 0b7a290d42ba..a13d0ff063fa 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -2,6 +2,7 @@ DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.4.1esr.source.tar.xz 334673424 BLAKE2B 3ba8bf545c4c2b92914bf7f63b539ba61dc2ee6c14fb8995a6d75adb4bd11988f1d47d2c64639cbecf7a4b01b99085e63af4eb3afc7a27047f03048ffa9c2c2d SHA512 287096ad67e86b307554475c3b5d1003a325d6d13987bfbec2ec79aa0f8004dce1614ab62585ba5cf153545618906ab640cd4657d5a910085afb3d8ceb46e8de
 DIST firefox-78.5.0esr.source.tar.xz 333995288 BLAKE2B 35140afb6b4d15052858e7864753ca74099edb24ed5e459f1f48114f0946f5e007486b5561ba9a545566033d71a69f0e6163dd17204cab717c441323972f089e SHA512 0d16013342b6e8d67adb5c111177ea4796db4fb593da8aa254d0d95bdf33fad798c2dbb235d44db4177c32dd2d7b3ac26b938b476342753ee8d6c83d968d0281
+DIST firefox-78.6.0esr.source.tar.xz 338098664 BLAKE2B 9d082b6104bffbd0d918dc1adf2a01ac32613d8048faf399177834c4949714a00c1f4383b778a21d6b6684296d8f9bd44fa547ee2507a8631d206e3764d2ceeb SHA512 a1e2d6af0020784d00ed3cb4d778c136685e7c2f6ae536cc270fbd331d51d483d17dff9acd7ad8e6b3b231b9df894c146092889357b23715814a080c6f08d11a
 DIST firefox-78esr-patches-04.tar.xz 171504 BLAKE2B d51e55c255d1f5cfa0c7c030b1ea50cb54951bed3bc21b21f5cb3b1e4b8b2ad406b3d12db2baabd4a90e3c88a38f187f277e7a4afe441ea6cf82c48f84bb0ac5 SHA512 6f00ec898fafb34d7c7e0ff2a6fb5c1cbf1205458845e14eb39c131125c5bf6b2418fea1050bb72449ec40e18fd775fc844437ce0290281d66961de40a53235a
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
@@ -11,4 +12,5 @@ DIST spidermonkey-52.0-patches-1.tar.xz 3112 BLAKE2B d8f4c44cb2ae290fa51efc4725a
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-02.tar.xz 3432 BLAKE2B 3ac46306f1740e704ed1aa8cb0f2a963d0b94bee60349ce31bc0ac477942781c9cdfa1d791a22e31c9258ade5d955cf6d32696ced73247777a908cb3e5c464c2 SHA512 d94c33d327d07072aa5ca66135ab2100e86acf38e091bf5b9644c537f77fb734433246a2f4bf58bf76d884510bce565b6ab75c23472be7e9d1f566dc4e812b5c
+DIST spidermonkey-78-patches-03.tar.xz 3732 BLAKE2B 5dc47527581c010994a102e6458119c762ec3836f57e403cbaac88c457f5f119bd75ae1a067307b20d229536f75db4b2b797408874d28156667ac63b61de8501 SHA512 f0921562dcd0ea519bf3f5ef2da43f87565e92493781d56e6e0b73d4124f41e7aadd34d8285bbb181f4286160dde0c9684920e98058f0683143a2687eb93cc1a
 DIST spidermonkey-slot0-patches-02.tar.xz 10952 BLAKE2B fb7bf5cdac6c821a48d407ff172fe0ec7297e047d3b3bab952f226f413b83ea70325175b41c1680725ff588111b424efc97a0c66e392989da510c43d38528ff1 SHA512 cd62890c4b58658d99fc1b52f05ccb35c07da835b168bb9d5e6b219de5021122c199cc2255c5b0be01ef582f53dd51c9975921e6bde9f14e9b43536e2bee85f2
diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml
index c97143567bf6..0e68089f7c5c 100644
--- a/dev-lang/spidermonkey/metadata.xml
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
 	<use>
+		<flag name="clang">Use Clang compiler instead of GCC</flag>
 		<flag name="custom-optimization">Build with user-specified compiler optimizations
 			(-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)</flag>
 		<flag name="debug">Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems</flag>
diff --git a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild
new file mode 100644
index 000000000000..e950feecaffa
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Patch version
+FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-03.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="firefox"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="+clang cpu_flags_arm_neon debug +jit lto test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=virtual/rust-1.41.0
+	virtual/pkgconfig
+	|| (
+		(
+			sys-devel/llvm:11
+			clang? (
+				sys-devel/clang:11
+				lto? ( =sys-devel/lld-11* )
+			)
+		)
+		(
+			sys-devel/llvm:10
+			clang? (
+				sys-devel/clang:10
+				lto? ( =sys-devel/lld-10* )
+			)
+		)
+		(
+			sys-devel/llvm:9
+			clang? (
+				sys-devel/clang:9
+				lto? ( =sys-devel/lld-9* )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+	>=dev-libs/nspr-4.25
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang && use lto ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+python_check_deps() {
+	if use test ; then
+		has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="7600M"
+	else
+		CHECKREQS_DISK_BUILD="6400M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use test ; then
+			CHECKREQS_DISK_BUILD="7600M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+		--disable-jemalloc
+		--disable-optimize
+		--disable-strip
+		--enable-readline
+		--enable-shared-js
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Tell build system that we want to use LTO
+	if use lto ; then
+		myeconfargs+=( --enable-lto )
+
+		if use clang ; then
+			myeconfargs+=( --enable-linker=lld )
+		else
+			myeconfargs+=( --enable-linker=gold )
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+	KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
+
+	if use x86 ; then
+		KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+		KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
+	fi
+
+	if [[ $(tc-endian) == "big" ]] ; then
+		KNOWN_TESTFAILURES+=( test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js )
+	fi
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index aebeb755bd46..a40ad3f2f145 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/leatherman/leatherman-1.12.3.ebuild b/dev-libs/leatherman/leatherman-1.12.3.ebuild
index 75314013d9e0..c7ed781d77ee 100644
--- a/dev-libs/leatherman/leatherman-1.12.3.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 #RESTRICT="!test? ( test )"
 RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index f5299d58a683..e8c737a84fa5 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1 +1 @@
-DIST libratbag-0.9.tar.gz 238225 BLAKE2B 74efbed2840103018195a73c11760a2022e42db5e81ba2e9d63a21bc5eb4c1dfed107382b657d2dc208101dfb53eb1926aaccc116ae66e3bf83e1218239dc1a2 SHA512 36215f534f9429c3b182f5502a2bbe16905492a634e327a845d65b638d7dd5ebb5c4eb1700a5196d6b5caac68e500603ced60c3c83f6d0c8e3c776e0161f657b
+DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
diff --git a/dev-libs/libratbag/files/ratbagd.init b/dev-libs/libratbag/files/ratbagd.init
new file mode 100644
index 000000000000..d3e7d08334ce
--- /dev/null
+++ b/dev-libs/libratbag/files/ratbagd.init
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="system daemon to introspect and modify configurable mice"
+pidfile="/run/${SVCNAME}.pid"
+command="/usr/bin/ratbagd"
+start_stop_daemon_args="--quiet"
+command_background="true"
+
+depend() {
+	need dbus
+}
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
new file mode 100644
index 000000000000..bd064182e849
--- /dev/null
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -0,0 +1,90 @@
+# 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 meson python-single-r1 systemd udev
+
+DESCRIPTION="Library to configure gaming mice"
+HOMEPAGE="https://github.com/libratbag/libratbag"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc elogind systemd test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( elogind systemd )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/gobject-introspection
+		dev-util/valgrind
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-group/plugdev
+	dev-libs/gobject-introspection
+	dev-libs/libevdev
+	virtual/libudev
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+	')
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	if use elogind ; then
+		# Fix systemd includes for elogind
+		sed -i -e 's@include <systemd@include <elogind@' \
+			ratbagd/ratbag*.c || die
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		$(meson_use doc documentation)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		-Ddbus-group="plugdev"
+		-Dlogind-provider=$(usex elogind elogind systemd)
+		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	newinitd "${FILESDIR}"/ratbagd.init ratbagd
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'You need to be in "plugdev" group in order to access the'
+		elog 'ratbagd dbus interface'
+	fi
+}
diff --git a/dev-libs/libratbag/libratbag-0.9.ebuild b/dev-libs/libratbag/libratbag-0.9.ebuild
deleted file mode 100644
index f85cd3509b79..000000000000
--- a/dev-libs/libratbag/libratbag-0.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson udev
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-libs/libevdev
-	virtual/libudev
-"
-
-src_prepare() {
-	default
-
-	sed '/default:/d' -i meson_options.txt || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-documentation=$(usex doc true false)
-		-Denable-tests=$(usex test true false)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libratbag/metadata.xml b/dev-libs/libratbag/metadata.xml
index 7899bfbe42b7..f0fab9cd91af 100644
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>alex@1stleg.com</email>
+    <name>Alex Barker</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+    <description>Proxy maintainer for Alex</description>
+  </maintainer>
   <upstream>
     <remote-id type="github">libratbag/libratbag</remote-id>
   </upstream>
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2ceff703f43b..bcb4d937030e 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,5 @@
 DIST nss-3.56.tar.gz 81706176 BLAKE2B 84c3b9fd649ce38ad843725b180982692dcac34e851734813b959734054f2e9ebfad66496de320f46e861381f6d5f52db0cc4c0953f7504b79f6b529b871f173 SHA512 f2eed8252c13b38a4d80a11203136d22a521205f814b6d954cc119ccf8921fcb8f689d919944bea4739d1575e9bda7e13cf2ad054ac91d51e049abe246efc845
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
 DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.60.ebuild
new file mode 100644
index 000000000000..383f86723a30
--- /dev/null
+++ b/dev-libs/nss/nss-3.60.ebuild
@@ -0,0 +1,358 @@
+# 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 multilib-minimal
+
+NSPR_VER="4.29"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://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.53-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
+
+	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 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=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	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} OS_TEST="$(nssarch)"
+	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/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 46aaf2d36312..b5debf23fbd4 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,2 +1,2 @@
 DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.1.tar.gz 386133 BLAKE2B d3a83a8be1b3e6605d7c9a6dcd48e4d467b44c2070238a01d1f0a511d2936a7a01efb26b080a4beceec7f02869e10392c3023c62d3e84eb94949ebefaceb73f9 SHA512 ab8da8744c4594a947d731a876717287892b64195d44d6e1c518bee5fb712a45b23ac763b12af0ad20c6f2cb74f6b1bae1a68fa90f786851aa6d3f139a32eda6
+DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
diff --git a/dev-libs/pugixml/pugixml-1.11.1.ebuild b/dev-libs/pugixml/pugixml-1.11.2.ebuild
similarity index 91%
rename from dev-libs/pugixml/pugixml-1.11.1.ebuild
rename to dev-libs/pugixml/pugixml-1.11.2.ebuild
index 0750359ebd79..ebdf4d377152 100644
--- a/dev-libs/pugixml/pugixml-1.11.1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.2.ebuild
@@ -18,3 +18,7 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
 
 LICENSE="MIT"
 SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-config.patch"
+)
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 7fbfb1985759..18e6617aa5fc 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,4 +1,4 @@
 DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9b0e32c868c8d4ecc15fbc359e6463576c24f38b6623cd72cc4681a1db42ec45ee605df6096876982caa9f96be91 SHA512 023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
-DIST simdjson-0.7.0.tar.gz 7972237 BLAKE2B b769eec1b8401c5a3cf0f69e99848afb8c64c1361634ac3f08313030318e781ad8be0463649ab3eb0b2d41a731d8fd3118a23ac33e14948281b5a3f5522c413f SHA512 ad0bd723b28654e43b9717bcc831aeb38ad86289fd3e9e9cd7a20bfe367428334505c35f3cb5b261feda500ddb0cad4780a9fb2504a62cb97db9d5c4fa666d2a
+DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
diff --git a/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild b/dev-libs/simdjson/simdjson-0.7.1.ebuild
similarity index 100%
rename from dev-libs/simdjson/simdjson-0.7.0-r3.ebuild
rename to dev-libs/simdjson/simdjson-0.7.1.ebuild
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 4bae7de21762..4b3d05943a12 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/ecls/ecls-20.4.24.ebuild b/dev-lisp/ecls/ecls-20.4.24.ebuild
index 693ecd634e2d..7bc3c17dbf39 100644
--- a/dev-lisp/ecls/ecls-20.4.24.ebuild
+++ b/dev-lisp/ecls/ecls-20.4.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz"
 
 LICENSE="BSD-2 LGPL-2.1+"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
 IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X"
 
 CDEPEND="dev-libs/gmp:0
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
similarity index 59%
rename from dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild
rename to dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
index 66c4e3131492..2fd5a1f8e262 100644
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r101.ebuild
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..2} )
+LUA_COMPAT=( lua5-{1..2} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="Bit Operations Library for the Lua Programming Language"
 HOMEPAGE="http://bitop.luajit.org"
@@ -28,11 +28,10 @@ src_prepare() {
 	default
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -45,12 +44,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_test() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
 
 	local mytests=(
 		"bitbench.lua"
@@ -66,12 +65,12 @@ lua_multilib_src_test() {
 	popd
 }
 
-multilib_src_test() {
-	multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+src_test() {
+	lua_foreach_impl lua_src_test
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	exeinto $(lua_get_cmod_dir)
 	doexe bit.so
@@ -79,10 +78,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index acc5743f111a..223fcb346062 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
similarity index 65%
rename from dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
rename to dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
index b062c42090b0..ce6096ca0c47 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/expat
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -34,11 +33,10 @@ src_prepare() {
 	sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -50,12 +48,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"DESTDIR=${ED}"
@@ -69,10 +67,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
similarity index 67%
rename from dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
rename to dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
index 490ff8633d54..e1907b637e49 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r101.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 
-inherit lua multilib-minimal toolchain-funcs
+inherit lua toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="https://github.com/tomasguisasola/luaexpat"
@@ -18,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/expat
 	${LUA_DEPS}
 "
 DEPEND="${RDEPEND}"
@@ -39,11 +38,10 @@ src_prepare() {
 	sed -e 's/-O2//g' -i makefile || die
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC) ${CFLAGS}"
@@ -55,12 +53,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
@@ -73,10 +71,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luasec/luasec-0.9-r102.ebuild b/dev-lua/luasec/luasec-0.9-r102.ebuild
index dfaab7645f99..8e58a7be7084 100644
--- a/dev-lua/luasec/luasec-0.9-r102.ebuild
+++ b/dev-lua/luasec/luasec-0.9-r102.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="deprecated"
+LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_REQ_USE="deprecated(+)"
 
 inherit lua toolchain-funcs
 
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
similarity index 64%
rename from dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
rename to dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
index 4591859cc608..b05a982025b9 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r1.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_REQ_USE="${MULTILIB_USEDEP}"
 
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Networking support library for the Lua language"
 HOMEPAGE="
@@ -19,9 +18,13 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="luajit"
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -35,17 +38,15 @@ src_prepare() {
 
 	# Workaround for 32-bit systems
 	append-cflags -fno-stack-protector
-
-	multilib_copy_sources
 }
 
-multilib_src_compile() {
+src_compile() {
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
 		"LD=$(tc-getCC)"
 		"LDFLAGS_linux=-O -fpic -shared -o"
-		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua$($(tc-getPKG_CONFIG) --variable V lua)"
-		"LUAV=$($(tc-getPKG_CONFIG) --variable V lua)"
+		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+		"LUAV=5.1"
 		"MYCFLAGS=${CFLAGS}"
 		"MYLDFLAGS=${LDFLAGS}"
 	)
@@ -53,21 +54,19 @@ multilib_src_compile() {
 	emake "${myemakeargs[@]}" all
 }
 
-multilib_src_install() {
+src_install() {
 	local myemakeargs=(
-		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
 		"DESTDIR=${ED}"
-		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
 		"LUAPREFIX_linux="
 	)
 
 	emake "${myemakeargs[@]}" install
 	emake "${myemakeargs[@]}" install-unix
 
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/$($(tc-getPKG_CONFIG) --variable V lua)"/luasocket
+	insinto "$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))/luasocket"
 	doins src/*.h
-}
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
similarity index 74%
rename from dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild
rename to dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
index dab20430d3c6..7020672331fb 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r101.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
@@ -4,11 +4,10 @@
 EAPI=7
 
 EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="${MULTILIB_USEDEP}"
+LUA_COMPAT=( lua5-{1..3} luajit )
 MY_P="${PN}-${EGIT_COMMIT}"
 
-inherit flag-o-matic lua multilib-minimal toolchain-funcs
+inherit flag-o-matic lua toolchain-funcs
 
 DESCRIPTION="Networking support library for the Lua language"
 HOMEPAGE="
@@ -40,11 +39,10 @@ src_prepare() {
 	append-cflags -fno-stack-protector
 
 	lua_copy_sources
-	lua_foreach_impl multilib_copy_sources
 }
 
-lua_multilib_src_compile() {
-	pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -63,12 +61,12 @@ lua_multilib_src_compile() {
 	popd
 }
 
-multilib_src_compile() {
-	lua_foreach_impl lua_multilib_src_compile
+src_compile() {
+	lua_foreach_impl lua_src_compile
 }
 
-lua_multilib_src_install() {
-	pushd "${WORKDIR}/${MY_P}-${ELUA/./-}-${MULTILIB_ABI_FLAG}.${ABI}" || die
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CDIR=$(lua_get_cmod_dir)"
@@ -88,10 +86,8 @@ lua_multilib_src_install() {
 	popd
 }
 
-multilib_src_install() {
-	lua_foreach_impl lua_multilib_src_install
-}
+src_install() {
+	lua_foreach_impl lua_src_install
 
-multilib_src_install_all() {
 	einstalldocs
 }
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
index 78a56a955c63..db40dc234cb3 100644
--- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -11,7 +11,7 @@ inherit php-pear-r2
 DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
 	https://phpunit.de"
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
index 5a99e1487807..70f553faf0cb 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8436ba398b93..082a3f476c80 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
index b4314c0f2407..ef91adf2eadf 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
index 57a5366aab6d..86187b7c4bd3 100644
--- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="Abstraction of various SASL mechanism responses"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
index b8d1392509c8..7d407a27e8b0 100644
--- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Framework for caching of arbitrary data"
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
index 468533acd109..c74a1d4d90cc 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 DESCRIPTION="Fast and safe little cache system"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index d3788c8cdeb3..1b73820bc490 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_CommandLine"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index 3a0c69449f47..70263d63bc9b 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
index 7f52dbd5d651..1eaaa2064341 100644
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Class that makes it easy to build console style tables"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 53f4edf909e4..e0f4c627a409 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
index 39a7348a4e3a..da09f3a06217 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
diff --git a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
index 071bed4607e7..d8fa915c73f3 100644
--- a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
+++ b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PEAR_PV=${PV/_alpha/a}
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Date and Time Zone classes"
 LICENSE="BSD"
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index efec088e7ab4..a31247b3d963 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/PEAR_Exception"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
index 04c7b1490393..30b8acbb6114 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Common file and directory routines"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index d0ca871cb2f0..c765d5f4bcc0 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/File_Find"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
index f4911dcef80e..56f2b8ecaaa3 100644
--- a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
@@ -9,6 +9,6 @@ DESCRIPTION="GNU Gettext file parser"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
index fd84f17b12f0..fbe7cee813a5 100644
--- a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
+++ b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Base class for other HTML classes"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
index 1d9005db15d3..fe556c1bc6d5 100644
--- a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
+++ b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ IUSE=""
 DESCRIPTION="Provides an interface for creating simple JS scripts within PHP"
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 src_install() {
 	insinto /usr/share/php/HTML
diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
index fbf07f50fd05..bbd41c5d71cb 100644
--- a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Makes the design of HTML tables easy, flexible, reusable and effici
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
index fd46f455f411..e4eb000d209b 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Autofill a table with data"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-HTML_Table-1.5-r1
 	>=dev-php/PEAR-Numbers_Words-0.13.1-r1"
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
index 9f308a78ce55..ba07b0168bb0 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 RDEPEND="!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1
 	dev-php/PEAR-File_Gettext )"
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
index 658dc509fdff..51686449f1a6 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
index 292a9fb26149..46f58bc9251e 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 eutils
 DESCRIPTION="Miscellaneous HTTP utilities"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 7efaf9fa5aa5..0a9fee491427 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="+curl +fileinfo +ssl test +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
index a745ff8c6f5c..9e54051a68a0 100644
--- a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
+++ b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="PHP interface to AT&T's GraphViz tools"
 SRC_URI="https://github.com/pear/Image_GraphViz/archive/3f8a01ae0597ca9d1d08a6e442cb0b153358fc0d.tar.gz -> ${PEAR_P}.tar.gz"
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
index b7a4107be235..d1c57691f825 100644
--- a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
+++ b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="This package provides a mechanism for modifying IPTC header information"
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index 7f0a72dee5f0..8c392374aaa7 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Log"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
index b8f5865dc858..cf8be255fb01 100644
--- a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
+++ b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PEAR MDB combines the PEAR DB and Metabase php database abstraction layers"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 RDEPEND="dev-php/PEAR-XML_Parser"
 HTML_DOCS=( doc/xml_schema.xsl doc/skeleton.php doc/xml_schema_documentation.html doc/tutorial.html doc/datatypes.html doc/Modules_Manager_skeleton.php )
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
index a0a6739e7dc8..346a59419248 100644
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
index 6c02e86f6c91..b89e7f68cc99 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mssql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
index 8fe922643f62..a1dc6b123e46 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mysqli driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
index 2dea3f0cbbf1..bc482ddfa28a 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, pgsql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
index 03f9c146fc0f..e77d4fa1ba4f 100644
--- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Class that provides multiple interfaces for sending emails"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
index d3b8fe4bc6c5..e22fdede48c0 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
index cd7919d7c8bc..8b1020cd58be 100644
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
index adfa2c539627..8a0462b278c6 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
index ac2c7ce25eb7..b92cd6281b4f 100644
--- a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
@@ -8,5 +8,5 @@ inherit php-pear-r2
 DESCRIPTION="Resolver library used to communicate with a DNS server"
 LICENSE="PHP-3.01 || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
index 777b6415f1ba..dee9753aac7f 100644
--- a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_DNSBL"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 sparc x86"
 IUSE="examples"
 RDEPEND="dev-lang/php:*
 	dev-php/PEAR-Cache_Lite
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index bbce63ac621e..60b4d96cea54 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MY_PN="${PN/PEAR-/}"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
 HOMEPAGE="https://pear.php.net/package/Net_LDAP2"
 SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
diff --git a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
index 9d057963b5f2..898fd95bb079 100644
--- a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
+++ b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Provides a POP3 class to access POP3 server"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+sasl"
 RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.6-r1
 	sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.2 )"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
index 97205682dbd5..14096f2f0e34 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples sasl"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index 8d21ec78bb5f..cbabb2dfdd7c 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="sasl"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
index 413a9729286b..ba5b36ad870c 100644
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
 DESCRIPTION="PHP class to communicate with IRC networks"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
index 69bf4f9740fc..b4991b9560d6 100644
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PHP class interface to TCP sockets"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
index ceadbc030473..687a32391527 100644
--- a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
+++ b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Easy parsing of URLs"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
index 436e6b7af4c5..e34a5782c9de 100644
--- a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
+++ b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 DOCS=( docs/6470.php docs/example.php )
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
index 4449b9ebd168..04a196c35c1a 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Determines Web browser, version, and platform from an HTTP user age
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index 17d5a9524b94..6694eafee62e 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Numbers_Words"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
index 4f789d2d6c6a..404cd3462a95 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="Package for reading and writing OLE containers"
 HOMEPAGE="https://pear.php.net/package/OLE"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
index 78dcbaeb6495..1b52326be86b 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
index 3251c24833c5..7e3fefadc4ea 100644
--- a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
+++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Data paging class"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/php-5.6.0:*"
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
index 9aea64a14364..1554c67f387b 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Package for generating Excel spreadsheets"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 RDEPEND=">=dev-lang/php-5.4:*[iconv]
 	>=dev-php/PEAR-OLE-0.5-r1"
 IUSE=""
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
index 7a8320bb1a84..5e963f1c61dc 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Structures_Graph"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
index 84e432729aea..ee64b4e889d0 100644
--- a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/System_Command"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 716200a0a39f..e86efe717a6c 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Text_Password"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
index 24295e7cc65e..edfbd30619ed 100644
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 vcs-snapshot
 DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # Pull from github as pear.php.net is not updated
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
index b1581cefac62..9949a081a0f2 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Validation class"
 LICENSE="BSD"
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
index 51a979e0e4df..cb8300b5fce6 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_test() {
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
index 7065b7a8d229..482610a92823 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pear.php.net/package/XML_RSS"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # Only needs PEAR_Exception (not in the tree), not all of PEAR.
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
index 149c678a9679..b0d0747acc6c 100644
--- a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Swiss-army knife for reading and writing XML files"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
index cea5e82621d9..3676080b9fd6 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 # PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
index 9dacbd149a26..946931da37b8 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
index e0d5a2764c10..6e31e37ca148 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
@@ -12,7 +12,7 @@ inherit php-pear-r2
 DESCRIPTION="Utility class for timing"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 HOMEPAGE="http://pear.phpunit.de/"
 SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
index 66d7999f6a01..584ae19d7a7f 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index ca56bfba3fb1..931b95aed14d 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
index e12d9f8af66a..cd6dc26dbfbd 100644
--- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
 DESCRIPTION="Simple template engine"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 
 DEPEND=">=dev-php/pear-1.9.4"
diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
index cceed4874600..b54b1c849b39 100644
--- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/YAML/YAML-1.0.6-r3.ebuild b/dev-php/YAML/YAML-1.0.6-r3.ebuild
index c52a33ba2493..3af602bad51a 100644
--- a/dev-php/YAML/YAML-1.0.6-r3.ebuild
+++ b/dev-php/YAML/YAML-1.0.6-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://pear.symfony-project.com/get/${PEAR_P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/adodb/adodb-5.20.14.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild
index 8e3d846c988f..e7a970d073ef 100644
--- a/dev-php/adodb/adodb-5.20.14.ebuild
+++ b/dev-php/adodb/adodb-5.20.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # If you want to be picky, we should require that PHP be built with at
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
index db9de5fabfe4..a23240d92e3d 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
index 1356394d53cd..10f5e60589cb 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/jpgraph/jpgraph-4.0.2.ebuild b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
index f2141936daa9..4a7a1f338b46 100644
--- a/dev-php/jpgraph/jpgraph-4.0.2.ebuild
+++ b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://jpgraph.net/"
 SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.gz"
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
 IUSE="truetype examples"
 
 DEPEND=""
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
index f82af5c8af5c..fa18a80f0e42 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
index 88fc33f6e0b4..1f8d2b20214f 100644
--- a/dev-php/pear/pear-1.10.1-r1.ebuild
+++ b/dev-php/pear/pear-1.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="PEAR - PHP Extension and Application Repository"
 HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index 21295a2e6faf..3fcf919582e9 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
diff --git a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
index df7fc22e980b..f2aa1de51a0d 100644
--- a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
+++ b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
index bade1b51f23c..e444d50c0972 100644
--- a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
+++ b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
index 7cbd16a1c114..43ea54707d99 100644
--- a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
+++ b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
index e4e8addb9b61..2a7be15445c1 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
index e409f8167f00..e54d3abab3f1 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
index b5d7ddf00b8f..601e1c9086e4 100644
--- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+++ b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
index fe3fe4c57312..1488738b635d 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
+++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
index b7d54c4f9eb3..87983369a3c1 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
index af5f88ca992b..a91aa10b3ced 100644
--- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
index a3609d1ece99..cbe1d4def8ed 100644
--- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
index fed44830adf0..c009cfcb320a 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
index 100d9e83a7c2..256ac1e6d492 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
index 3a50601608a6..99e54f1f8bae 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
index 940e38fd87db..7aeb39d9e647 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
index f0216f9ebff8..df963717269d 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
index 81d4571947e0..5e8a74302553 100644
--- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
+++ b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.33.ebuild
index 17f7e0785596..838dc8fab1c7 100644
--- a/dev-php/smarty/smarty-3.1.33.ebuild
+++ b/dev-php/smarty/smarty-3.1.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
index cb87bb539e18..d0cd3eafe328 100644
--- a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
+++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/yaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
index 2aa48ea7b94c..a570a508a6ab 100644
--- a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
+++ b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 801d06a46914..bdd050420df3 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index 327bbae6cba0..71191cb6e580 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1 +1,2 @@
 DIST argparse-manpage-1.4.tar.gz 33661 BLAKE2B b2f6a0bb7ef3a95470e73c4c94b9fef42f130433d5f91263201d98c0afebd4c3fc38153a172aa86c50a773e3270e1f618083f968bd38a86046362367f2e8c022 SHA512 4756781dbe988541cb0e1fd8a79c4d262c7bf54397fb302ff3ad706e9a896d68f781931e73013cdd7136efc6e46914118b862e0377f49b73fb25b20d0a23744d
+DIST argparse-manpage-1.5.tar.gz 34290 BLAKE2B 598a0eb0d4816a764c1ba4093b18e28d7865c9a113db1910793748eb24394636a9e1caad86fef5416933ae5341026048d1e39ce928131a8796a5d66a40e36853 SHA512 bfdea19fa62ac029754d6df26c4fb51c18f7fee4fae681c1117253627e724cf1ff1db5196ad0690fd436cebbe403536905f157cb7eae7be50d321c663b491fd0
diff --git a/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
new file mode 100644
index 000000000000..4eeae5dd8498
--- /dev/null
+++ b/dev-python/argparse-manpage/argparse-manpage-1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Automatically build man-pages for your Python project"
+HOMEPAGE="https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/"
+SRC_URI="https://github.com/praiskup/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 2b69a81c52cd..f773b184fbd8 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,3 +1,4 @@
 DIST autobahn-20.12.1.tar.gz 1269156 BLAKE2B ff763accde6a2929fd777364c926132b8317d80f137d67768bf192fb72f45597ac115824783f01debacc773dcc9a60325692ac420e55b6f67f4ebc2cdc6187ae SHA512 df7c7065e050efb5f315055c05aa9b4fcf8636e7208f17b583ed0823a071c6484adcf610308e83df3b5bbb91a4df19266e739abc8405e34483b1bf3d9f2c74c7
+DIST autobahn-20.12.2.tar.gz 1269167 BLAKE2B f6ea51682c13690002796f2a45bd11fc2f8497eeee25a1786e942111f43f9dc1f7f806281e4dc37d1ed0aa302fc5c5e47a55d876e010580d7a08eb5ac7534ed0 SHA512 aa6d5e77ba6129931a07cad13f839d5c76267b8126a05ade4ed1c7183ce019faf6656105a853515b543e5ac34ab20d02821b29aa68eb51c385880ad3919d1dcc
 DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
 DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
diff --git a/dev-python/autobahn/autobahn-20.12.2.ebuild b/dev-python/autobahn/autobahn-20.12.2.ebuild
new file mode 100644
index 000000000000..3633e2beeaa0
--- /dev/null
+++ b/dev-python/autobahn/autobahn-20.12.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="crypt scram test xbr"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
+	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
+	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+	)
+	scram? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/argon2-cffi[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+	)
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	echo "Testing all, cryptosign using twisted"
+	export USE_TWISTED=true
+	cd "${BUILD_DIR}"/lib || die
+	"${EPYTHON}" -m twisted.trial autobahn || die
+	unset USE_TWISTED
+	echo "RE-testing cryptosign and component_aio using asyncio"
+	export USE_ASYNCIO=true
+	py.test -v autobahn/wamp/test/test_cryptosign.py || die
+	py.test -v autobahn/wamp/test/test_component_aio.py || die
+	unset USE_ASYNCIO
+	rm -r .pytest_cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# delete the dropin.cache so we don't have collisions if it exists
+	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
+}
+
+pkg_postinst() {
+	python_foreach_impl twisted-regen-cache || die
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache || die
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index abedde06f0b1..a2115a889bac 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,4 +10,5 @@ DIST boto3-1.16.26.tar.gz 340309 BLAKE2B df2c193b5e40f52381a4214fd5c6db9dcb0f32e
 DIST boto3-1.16.28.tar.gz 340709 BLAKE2B 3c5520531efbb5e20f679f28f4c60964a7be38a0601f73dc0fa5ab3e2cb96939d985c1ebc20869b3fd2f556e9da836fdce4d92377fb9168eccd13cbcffd7c8c6 SHA512 72c10598560ad8d227250274fb296f11e6a1c417f8430221fd8a85e920c8a783be77193dd83ac53dc5000c2ea27c8ff626a5ef3cdee0a467237e732dd6442cdd
 DIST boto3-1.16.29.tar.gz 340743 BLAKE2B 1ef74d98aecf8dfd46bc340984d65e5dc2a70f320149b6bab18588a8371d0da6c93102da96f12950d0730c871fb6f13c7441f7ca148f974cb8678bd01b3af24a SHA512 59f8dba245c7525e4ddeec121d85919310e2bd6cf90419c19612434beff66bab4cca22968347512b0f9f2563ff3ee4d85e2d01bf10ce175c3a12a9a09c2e09a6
 DIST boto3-1.16.30.tar.gz 340801 BLAKE2B fcf87b43d2c18ecf1e9d7f0c8c423143e44777a6249a9893d0ebb4016703a9d87a157ed71fca98c8bd73419e6dd2bd2621d42406220e67e6dd462e1088837334 SHA512 66d3e4ae6296b1fbd31187228246c99e472ccfba756d6ca304eca134271d43dd80d1bc35af1fb63336a7c63f2341212329dde307cbbb2dce25e2aa0705c6a436
+DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c002f6f5d992fe49c93528d59d5740de6c8782af71d94461ea704a36d8ed46ccadfbf83982504ab507aab9b058 SHA512 06d9c6e721d1ab529e6a598b14ba6f740bec32a8165582853149b9aa294f0a272d0da4222f0dc7ef83055d91b4b0a0176e65bb34784990aca43e44db43650a2d
 DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
diff --git a/dev-python/boto3/boto3-1.16.36.ebuild b/dev-python/boto3/boto3-1.16.36.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.36.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d08c30b41e06..c332fcea1ee0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,4 +10,5 @@ DIST botocore-1.19.26.tar.gz 7124956 BLAKE2B 6091c9536de9a3171a2327ca1d1531799fa
 DIST botocore-1.19.28.tar.gz 7208608 BLAKE2B eab5731c530747421186c3e24cc0cb0f5b120b37e4a4d587a5ec0b118d138ff13fb9608bd028a3182aa353f188f56f0c2a05c918aafc8d79eaa87ba89d5b4265 SHA512 71de40c171b1aabdcad159b2e6817740e793a29eda99c6cdad28643bc444a26fbcd7594d927bfbe031c4e4c8b74826ba51efb37376f5a70d8a2591c524a2301a
 DIST botocore-1.19.29.tar.gz 7219708 BLAKE2B c5468be09300edf1acfb82780ad026ad78537b641b9f8f9384c41397e293a51559259c64925dac2852b888a28b49c23b7802b2c3adaca097424029fe9717044c SHA512 674f76a443541ff3665dbb1834ac69f8776e497526001db9bd229f22ea2137452c3bf954d8a6b74a732bd9e7212545cae19c9058357a38c357ed09d89c9c1cc5
 DIST botocore-1.19.30.tar.gz 7224700 BLAKE2B 50712be7e6e4a8a22607d567a8d227bbc6d9a7156c245a9faa5adf0e94364d5e5738dd558534e072d071e88315fd79555454fd5f36dfb5d309effca6a39f2247 SHA512 8d9a0becad072ac01e04c1709e8851344bbcd35ecb6c269cace7c229e3b2e48b8fd91ca31be96c67831030a75a63027e8700772601a65eb529bcfd8a58434b6c
+DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1f300fc9bdbc0b215a3630adb70c29a951c6dff2a6ebfde42872cbc3af4c442d09fa0233b2c957521e6a5e05816c60 SHA512 420ad7c59496b2b74ba6ecde8dc40ac3e47c5676335f7471448fcdde5b70bda3bd7516963788d8a7a940aaa9cf488b6529e6fbd2842806f58520cd8e2dc15a60
 DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
diff --git a/dev-python/botocore/botocore-1.19.36.ebuild b/dev-python/botocore/botocore-1.19.36.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.36.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 distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 558e8a943c25..9610838fc5fe 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1 +1,2 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
+DIST dataclasses-0.8.tar.gz 36581 BLAKE2B fb4cad844f00157a8affc85a0c5d949d7d44fd67ca8083262247af46d93be189628c4ab7b37d34dea983059615603342d50d8b9d0ab75f5365463a337d312b6a SHA512 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a
diff --git a/dev-python/dataclasses/dataclasses-0.8.ebuild b/dev-python/dataclasses/dataclasses-0.8.ebuild
new file mode 100644
index 000000000000..3637681c4e08
--- /dev/null
+++ b/dev-python/dataclasses/dataclasses-0.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# this is a backport. do not add extra impls
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A backport of the dataclasses module for Python 3.6"
+HOMEPAGE="
+	https://pypi.org/project/dataclasses/
+	https://github.com/ericvsmith/dataclasses"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+distutils_enable_tests unittest
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 620b2c9076ac..f3ce28c71547 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1 +1,2 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
+DIST google-api-core-1.24.0.tar.gz 129718 BLAKE2B 08bb8aef03d5f5cbc96c06c01d103e1e569f15bad5084ba24a5e13f732b10d9d97a299fe22db7dfdaea73809e9458b811de87a028f77dcb00ca62fc069af63b1 SHA512 9517e86389edb824fe178128003fa245857de47f4b2416e0a345b66e02fe5fb109b7a72f2e9adfd52478862165548ce6945761a5a2ca02eda4a0187ca608760b
diff --git a/dev-python/google-api-core/google-api-core-1.24.0.ebuild b/dev-python/google-api-core/google-api-core-1.24.0.ebuild
new file mode 100644
index 000000000000..78bdc1d03c09
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.24.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 317d5c49f9ba..a31de1663821 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1 +1,2 @@
 DIST google-auth-1.20.1.tar.gz 107375 BLAKE2B 2f57cd9752c46891c59ed13e2ec8c6f98e5b3cd07d329769a78872877a17580c1ff5bb9da0381ef9bd4b6b9f72f04125ef71102543cfe1dc7bc3b09a5d5d9039 SHA512 6aad44b58c71f96c686606d6e8b6f273c64ce1559737920ccc31ad761442cad7f5fab19a59daee9408b284405a00c2de769c00221ac91bcfdd48851dba6f680f
+DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
diff --git a/dev-python/google-auth/google-auth-1.24.0.ebuild b/dev-python/google-auth/google-auth-1.24.0.ebuild
new file mode 100644
index 000000000000..f33fd88d8afa
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.24.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# delete stray files included in the tarball
+	find "${S}"/tests -name '*.pyc' -delete || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index 149389b39c49..33b26cd26986 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1 +1,2 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
+DIST googleapis-common-protos-1.52.0.tar.gz 39383 BLAKE2B 0b2a21b62c1e48cec91b6fe0d141baa1c1081b621c27d60d0a045932388d8c1b8c1eaee3219cdc3af1919b19358e6ec759e109865367b1b7879b3af05f7ec9be SHA512 470d949379a6aa21875b1c5851de54391847f89136b0b7ee84ac68931388a6294f53be167b6095265b2c2c0f30c7d8c71a4e5a546638670d24a9bd544538ff1a
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
new file mode 100644
index 000000000000..1c0536a357ba
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 6e16f8204efb..e59752ac5b68 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1 +1,2 @@
 DIST joblib-0.17.0.tar.gz 345984 BLAKE2B 4f4cb83037fc02ce9ea17e7dc5d284235b847eeb90bf1a877c4168aabd9ad4dd762e45a6485806efc759cdfcb98e6ee70e6d9a498cd7645b1d6b0051a9f9ba2e SHA512 73c42a9f5949478a4a03b97ec31549cabca2ebc968d2c869632696b671c175dc85ae7aa8ac92905f13f830083b2305b56df1552f1d70fa7fe51945ae7286840a
+DIST joblib-1.0.0.tar.gz 346996 BLAKE2B 6f31dba31e451fe1d05e7a34bc211b641e10a6dda21cc6a4d283a594744caa3434748a2c2c661c468931e509d815596db18ce1cbed287ae6b0da287490256dec SHA512 3fad2f3d4d6651d2c0376403b3658defc9ae1acf08b2e187f77b440040ad414bf723241d685df862c08b88d784ded915f5794d0e0c29841d9acae4db200d7213
diff --git a/dev-python/joblib/joblib-1.0.0.ebuild b/dev-python/joblib/joblib-1.0.0.ebuild
new file mode 100644
index 000000000000..d1dbc58f1892
--- /dev/null
+++ b/dev-python/joblib/joblib-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+# joblib is imported by setup.py so we need ${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	# https://github.com/joblib/joblib/issues/1115
+	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
+		-i joblib/test/test_memory.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
index 8cc00f501540..a5521daaaa91 100644
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit edos2unix distutils-r1
 
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 562ba1c9251b..0229ec273851 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 4ece3fe2d8bb..fdf9ceeef8ec 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1 +1,2 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
+DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
new file mode 100644
index 000000000000..a8226a33c22f
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/slixmpp/slixmpp-1.5.2.ebuild b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
index 64f1fc02263a..4bdc2f5616c8 100644
--- a/dev-python/slixmpp/slixmpp-1.5.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
@@ -31,4 +31,6 @@ RDEPEND="
 	${DEPEND}
 "
 
-distutils_enable_tests pytest
+python_test() {
+	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/slixmpp/slixmpp-9999.ebuild b/dev-python/slixmpp/slixmpp-9999.ebuild
index 64f1fc02263a..4bdc2f5616c8 100644
--- a/dev-python/slixmpp/slixmpp-9999.ebuild
+++ b/dev-python/slixmpp/slixmpp-9999.ebuild
@@ -31,4 +31,6 @@ RDEPEND="
 	${DEPEND}
 "
 
-distutils_enable_tests pytest
+python_test() {
+	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
new file mode 100644
index 000000000000..36c72ae4158f
--- /dev/null
+++ b/dev-python/stomp-py/Manifest
@@ -0,0 +1 @@
+DIST stomp.py-6.1.0.tar.gz 34690 BLAKE2B bf7ec2899be25bdc373e7d0d73281a6c4aa8b91a05e6ede263f0f9498b2ba3b9bd2c90b0fe472664c930dadf68ccaf09c74b69e7270259c3959396edff04e07b SHA512 73284b5dac8b9ef0d1251cc1059c4b1a545018a39498303d211fd165f0fb80439f2e01f82e18644cfd5d77a4badedcbced57d184ffc7c19f57945e5262f2394a
diff --git a/dev-python/stomp-py/metadata.xml b/dev-python/stomp-py/metadata.xml
new file mode 100644
index 000000000000..53838ba131f5
--- /dev/null
+++ b/dev-python/stomp-py/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">stomp.py</remote-id>
+		<remote-id type="github">jasonrbriggs/stomp.py</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stomp-py/stomp-py-6.1.0.ebuild b/dev-python/stomp-py/stomp-py-6.1.0.ebuild
new file mode 100644
index 000000000000..43324414a605
--- /dev/null
+++ b/dev-python/stomp-py/stomp-py-6.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client library for the STOMP messaging protocol"
+HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
+
+# stomp.py test suite requires quite a few appropriately configured
+# messaging servers (as of 6.1.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
+# stompserver). Upstream relies on Docker to provide those servers, however
+# doing the same in src_test would require both granting the portage user
+# extra permissions and packaging the base image (trying to download it
+# on the fly would violate the network sandbox).
+# Side note: PyPI tarballs do not include tests.
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3cf907d216d0..534ceea2ac95 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/allison/allison-2.0.3-r3.ebuild b/dev-ruby/allison/allison-2.0.3-r3.ebuild
index d9de8c634b3c..2d75d540e521 100644
--- a/dev-ruby/allison/allison-2.0.3-r3.ebuild
+++ b/dev-ruby/allison/allison-2.0.3-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://fauna.github.com/fauna/allison/files/README.html"
 
 LICENSE="AFL-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris"
 IUSE=""
 
 all_ruby_install() {
diff --git a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
index 02830d99ca55..a1f2ed0cbeb5 100644
--- a/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
+++ b/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.8.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index d2ca9b0b5829..e1f715e6bbe4 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.4.ebuild b/dev-ruby/asciimath/asciimath-1.0.4.ebuild
index 324c7d22e113..960716b9c407 100644
--- a/dev-ruby/asciimath/asciimath-1.0.4.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.4.ebuild
@@ -16,7 +16,7 @@ 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=""
 
 RUBY_PATCHES=( ${P}-backslashes.patch )
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index ac38dab0c037..c637713081cc 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/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
index 427fca75a658..b2301eb94cfe 100644
--- a/dev-ruby/atomic/atomic-1.1.101.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
index e4275447b232..adc2dfaaf5bd 100644
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ b/dev-ruby/backports/backports-3.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/marcandre/backports"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
index 5e0324cc36bc..83dcc118da1d 100644
--- a/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
+++ b/dev-ruby/bacon/bacon-1.2.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
index 41d7d9b1d8fb..3cebf513ccfe 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://rubygems.org/gems/blankslate"
 IUSE=""
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 all_ruby_prepare() {
 	# Avoid test failing with rspec 2.x.
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
index 56f5dc553ca8..1aa7804b57ee 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://0xcc.net/ruby-bsearch/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/childprocess/childprocess-3.0.0.ebuild b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
index f62cfad2e405..780c28cf29e0 100644
--- a/dev-ruby/childprocess/childprocess-3.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-3.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/chronic/chronic-0.10.2.ebuild b/dev-ruby/chronic/chronic-0.10.2.ebuild
index c1ec452f65a2..85c6306b502b 100644
--- a/dev-ruby/chronic/chronic-0.10.2.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Chronic is a natural language date/time parser written in pure Ruby
 HOMEPAGE="https://github.com/mojombo/chronic"
 LICENSE="MIT"
 
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/coderay/coderay-1.1.2.ebuild b/dev-ruby/coderay/coderay-1.1.2.ebuild
index 0d26009a63bd..f84754692b02 100644
--- a/dev-ruby/coderay/coderay-1.1.2.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rubychan/coderay/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Redcloth is an optional but automagically tested dependency. This
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
index f02868909236..be852d6dcd6d 100644
--- a/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
diff --git a/dev-ruby/daemons/daemons-1.3.1.ebuild b/dev-ruby/daemons/daemons-1.3.1.ebuild
index 3cc15f592f7a..95e896b457a8 100644
--- a/dev-ruby/daemons/daemons-1.3.1.ebuild
+++ b/dev-ruby/daemons/daemons-1.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
index 2a7e95330b46..a2568d2d99db 100644
--- a/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
+++ b/dev-ruby/deep_merge/deep_merge-1.2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://trac.misuse.org/science/wiki/DeepMerge"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index e7422d0d2ae8..c1fc0bb0eef7 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
index ce23d1f2ac1d..09b7f69a9a01 100644
--- a/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20180417.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-domain_name"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index 7abf03bc1c76..420d4b66e12f 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rack )"
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index 78c78cb225a3..65ed81f9c6a9 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -14,7 +14,7 @@ inherit multilib ruby-fakegem
 DESCRIPTION="FastCGI library for Ruby"
 HOMEPAGE="https://github.com/alphallc/ruby-fcgi-ng"
 
-KEYWORDS="amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="Ruby"
 
 DEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/ffi/ffi-1.11.3.ebuild b/dev-ruby/ffi/ffi-1.11.3.ebuild
index 2557cb1ab4a1..2997217694c6 100644
--- a/dev-ruby/ffi/ffi-1.11.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.11.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND+=" dev-libs/libffi:0="
 DEPEND+=" dev-libs/libffi"
diff --git a/dev-ruby/gherkin/gherkin-5.1.0.ebuild b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
index 94602ca59989..39c87437f0ba 100644
--- a/dev-ruby/gherkin/gherkin-5.1.0.ebuild
+++ b/dev-ruby/gherkin/gherkin-5.1.0.ebuild
@@ -19,6 +19,6 @@ DESCRIPTION="Fast Gherkin lexer and parser"
 HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="5"
 IUSE=""
diff --git a/dev-ruby/hiera/hiera-3.6.0.ebuild b/dev-ruby/hiera/hiera-3.6.0.ebuild
index 1ae2f8437ed9..03029fd73800 100644
--- a/dev-ruby/hiera/hiera-3.6.0.ebuild
+++ b/dev-ruby/hiera/hiera-3.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://docs.puppet.com/hiera/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
diff --git a/dev-ruby/highline/highline-2.0.3.ebuild b/dev-ruby/highline/highline-2.0.3.ebuild
index a2bd9a85a0e2..61b6a65d964a 100644
--- a/dev-ruby/highline/highline-2.0.3.ebuild
+++ b/dev-ruby/highline/highline-2.0.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
 	# fix up gemspec file not to call git
diff --git a/dev-ruby/hoe/hoe-3.21.0.ebuild b/dev-ruby/hoe/hoe-3.21.0.ebuild
index f96952a25e1c..be1d1d39fae9 100644
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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 ~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="doc"
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
index 0f57dad30721..0f056d62fd83 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
index 0d621067ee68..0a55a283d84f 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/introspection"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/blankslate:*"
diff --git a/dev-ruby/introspection/introspection-0.0.4.ebuild b/dev-ruby/introspection/introspection-0.0.4.ebuild
index aca29aecf6fb..2d331f211a64 100644
--- a/dev-ruby/introspection/introspection-0.0.4.ebuild
+++ b/dev-ruby/introspection/introspection-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/metaclass-0.0.1"
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
index 61f1a0e79d39..4641822c37e2 100644
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ b/dev-ruby/locale/locale-2.1.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
 LICENSE="|| ( Ruby GPL-2 )"
 SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-macos"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
index 2337cbf8adcc..90b18cdbabc7 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index 7ae367197111..41ecf240b7f2 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mime-types/mime-types-2.99.2.ebuild b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
index 7a5e9cade415..134417b761c6 100644
--- a/dev-ruby/mime-types/mime-types-2.99.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
index 56ec26e51565..e2223dbe979c 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-ruby/mocha/mocha-0.14.0.ebuild b/dev-ruby/mocha/mocha-0.14.0.ebuild
index 7e0692716b9d..3fce5d0153ad 100644
--- a/dev-ruby/mocha/mocha-0.14.0.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
 SLOT="0.14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
index a4d695cbe018..8fb051072333 100644
--- a/dev-ruby/mocha/mocha-1.8.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.8.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mocha.jamesmead.org/"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
index cc849a4493c3..7a506ac265ed 100644
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index c0cb20182d80..a1a87bd0e656 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~s390 sparc 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_test/multi_test-0.1.2.ebuild b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
index 70246068398c..c9a294accd92 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="http://cukes.info/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1.ebuild
index af9ce610fb75..12424c6fe07f 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
index 7fd277a75303..11ef1db01bb1 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extremely mynymal test framework"
 HOMEPAGE="https://github.com/mynyml/nanotest"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index f643a9e405ca..aa48f74c788d 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
index 94de349882c7..0941351c90c4 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
index a25cbec7104d..3fb1a2238289 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
index 17d695bd19df..339f7b793489 100644
--- a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A pkg-config implementation by Ruby"
 HOMEPAGE="https://github.com/rcairo/pkg-config"
 LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/rack/rack-2.2.3.ebuild b/dev-ruby/rack/rack-2.2.3.ebuild
index e58fee1b6078..482cecfe3a75 100644
--- a/dev-ruby/rack/rack-2.2.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
index fb9cec9efee5..d1c395fb3750 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 
 SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
index fbd552775b52..bdd47515e002 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index aaceeed0a134..b7d853745e01 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
index b1a451e57f41..6e39855df745 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/redcloth/archive/v${PV}.tar.gz -> ${R
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index 9236c031e4e7..eabab3a31190 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 5cdbff70938b..6a6fcb3eb238 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index ff3770771f24..8bdf154cb92b 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
index 3cdbd73abcb4..36789d43706c 100644
--- a/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-2.99.2-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
index 8c26715a4d02..e72306ca4831 100644
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
index d5009ecc1b08..1147bb6d1d93 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-2.99.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.1.3"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
index 094526b1f9c8..30946ccf64d5 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
index 58deb927e793..4979f2d9ae16 100644
--- a/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
+++ b/dev-ruby/rspec-its/rspec-its-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec-its"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.0.0 >=dev-ruby/rspec-expectations-3.0.0"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
index 7070d720dbad..bc833e5fb181 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
index 56698cdd75c9..049d06363fe8 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
index 7aad823ef6b3..2f7d780b966d 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/rspec-2.99.0.ebuild b/dev-ruby/rspec/rspec-2.99.0.ebuild
index 8f86cd9711e9..e807b190f4f5 100644
--- a/dev-ruby/rspec/rspec-2.99.0.ebuild
+++ b/dev-ruby/rspec/rspec-2.99.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rspec.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 025dfc17d0a6..74edd01d143f 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
index b8da9e90c381..b4c837d59ef0 100644
--- a/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
+++ b/dev-ruby/ruby-augeas/ruby-augeas-0.5.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.augeas.net/ruby/${P}.gem"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=app-admin/augeas-1.1.0"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
index efc05b841e4f..6c3286676959 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
index d45f53bcdfb1..59e481b36230 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
 DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
 HOMEPAGE="https://ruby-gettext.github.io/"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 SLOT="0"
 LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
index fe8e2531154b..565b8910eadd 100644
--- a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A Ruby interface to some LDAP libraries"
 HOMEPAGE="https://github.com/bearded/ruby-ldap"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~x86-macos"
 IUSE="ssl"
 DEPEND=">=net-nds/openldap-2
 	dev-libs/cyrus-sasl
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
index e13565a006f8..ee4729a2f4b2 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.10.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/larskanis/opengl"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 IUSE=""
 
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
index edc5690fc4cf..ba1bda72595a 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
index 6ac4d1dceb67..12ed83331102 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 508805e66393..d44f10f3af2e 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
index a02c7b8db55f..64df93ee4422 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
index 217de7cc7ed0..f6345ab20e2d 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index 6d2228025de4..c4b7494b5ec5 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
index 0eb14bdce896..2693101b352f 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.2.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE=""
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index 3f632e580862..bd76d7209144 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
 # by author.
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND+=" test? ( sys-apps/coreutils )"
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
index 94db62b4770e..df2427df5b91 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
index 5ca9606a6375..73fd7694f767 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
index 6f230b6f61ff..1a21cd1506ee 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r2.ebuild
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/syntax/syntax-1.2.2.ebuild b/dev-ruby/syntax/syntax-1.2.2.ebuild
index cbd859768a38..22fc9d2dcdfc 100644
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~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 ~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="test doc"
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
index 4e9844ad8f05..30378b78faae 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.7.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Small Ruby library that colors strings using ANSI escape sequences"
 HOMEPAGE="https://flori.github.io/term-ansicolor/"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~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 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
index 70df1ee3029b..bc5f583b5228 100644
--- a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/test-unit/test-unit-rr"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
index c9dd42d62bd8..774393ecc49b 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://rubyforge.org/projects/text-format"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/text/text-1.3.1.ebuild b/dev-ruby/text/text-1.3.1.ebuild
index e4c7abade110..676fce1f7106 100644
--- a/dev-ruby/text/text-1.3.1.ebuild
+++ b/dev-ruby/text/text-1.3.1.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-ruby/thread_order/thread_order-1.1.1.ebuild b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
index cb59efc53312..460776a5719c 100644
--- a/dev-ruby/thread_order/thread_order-1.1.1.ebuild
+++ b/dev-ruby/thread_order/thread_order-1.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JoshCheek/thread_order"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index 884af1d7983b..5cea0f0febbe 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 074dbca94f15..8dcc984dd743 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/tins/tins-1.20.2.ebuild b/dev-ruby/tins/tins-1.20.2.ebuild
index d3740dbf9b33..48ecc71b37ba 100644
--- a/dev-ruby/tins/tins-1.20.2.ebuild
+++ b/dev-ruby/tins/tins-1.20.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
index 5e6d87ccbff5..9d6cfc232fb7 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 x86 ~amd64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/timezone-data"
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
index 29d2257a67c2..6c6968c38691 100644
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ b/dev-ruby/unf/unf-0.1.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
index 5543990925e9..154080cccb2e 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.7.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/unindent/unindent-1.0.ebuild b/dev-ruby/unindent/unindent-1.0.ebuild
index bb9324328693..5bc4e08abda7 100644
--- a/dev-ruby/unindent/unindent-1.0.ebuild
+++ b/dev-ruby/unindent/unindent-1.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Ruby method to unindent strings"
 HOMEPAGE="https://github.com/mynyml/unindent"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index 9b65c9598c09..f6fa3aa93621 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-ruby/yard/yard-0.9.20.ebuild b/dev-ruby/yard/yard-0.9.20.ebuild
index e93b0ee66657..b477b38a5db1 100644
--- a/dev-ruby/yard/yard-0.9.20.ebuild
+++ b/dev-ruby/yard/yard-0.9.20.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
diff --git a/dev-ruby/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
index 22022629ad42..70da21bb3a5f 100644
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a1ea3d963e40..216238afb2cd 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index b39e9f9ee5b7..63e3a70e5fbb 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 890793c28c85..14b3610ba9c6 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index b05661e6d5d1..208fee6a9ffd 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index c35de6ca6a17..dec93497b0fe 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index b57396addc44..0da795ecad21 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index 677acd29bcc3..3a08be31777e 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 8b65820d3eff..7f5e52e234c9 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1 +1,2 @@
 DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
+DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
diff --git a/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
new file mode 100644
index 000000000000..21c906d48591
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-libs/double-conversion
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index a1a296a1d356..a8ed9c271124 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index c107109dcc38..5c145f44a2a5 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,4 @@
+DIST strace-5.10.tar.xz 1859688 BLAKE2B 45c40854c9af95395cb274fbfddc3d0084e77cc403ffe104f72ce7592800452776f5c19d03649cdd6705bccc7a0859364e470bdd5344f64af54b798fab50475e SHA512 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
 DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 DIST strace-5.9.tar.xz 1847036 BLAKE2B 92d6b5e1a7821086b4e0e535d5db7849158e58ac0604fb9bb667e106b72b1ce17dfadd3960efcf553d7c7dec4622db36833aa5cdd4bc924f8b54ec6168ed82dd SHA512 f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206
diff --git a/dev-util/strace/strace-5.10.ebuild b/dev-util/strace/strace-5.10.ebuild
new file mode 100644
index 000000000000..c08dbf18c0a5
--- /dev/null
+++ b/dev-util/strace/strace-5.10.ebuild
@@ -0,0 +1,104 @@
+# 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
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--disable-gcc-Werror
+		--enable-mpers=check
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 6c624a2bef9a..05772ff549ef 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild
index 7b8b1e592dca..93db1164a50e 100644
--- a/gnome-base/gdm/gdm-3.36.3.ebuild
+++ b/gnome-base/gdm/gdm-3.36.3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 
-inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
+inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -187,10 +187,11 @@ src_configure() {
 	)
 
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 
diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild
index 12a42230f315..8a86e224747e 100644
--- a/gnome-base/gdm/gdm-3.36.4.ebuild
+++ b/gnome-base/gdm/gdm-3.36.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 
-inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user
+inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
 HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -187,10 +187,11 @@ src_configure() {
 	)
 
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
-			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
index 033c47fe3410..b0eb921b5595 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2
+inherit gnome2 toolchain-funcs
 
 DESCRIPTION="GNOME Flashback session"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/"
@@ -71,11 +71,12 @@ src_configure() {
 	fi
 
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
-			DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-			DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null`
-			SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
-			SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null`
+			DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)"
+			SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
+			SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)"
 		)
 	fi
 
diff --git a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
index a2d70aaaaf63..c33ffe3fbb7c 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eapi7-ver gnome2
+inherit eapi7-ver gnome2 toolchain-funcs
 
 DESCRIPTION="The GNOME Flashback Panel"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
@@ -61,9 +61,10 @@ src_configure() {
 	fi
 
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
-			MENU_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
-			MENU_LIBS=`pkg-config --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null`
+			MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+			MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
 		)
 	fi
 
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 4aa685109b59..d651ee4e677c 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index a9bbddee101b..268c345cb33e 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC 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="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 7f111dfd0a6a..2f8bb58a4b3e 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 17274eb09b9c..c839916999f9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,4 @@
 DIST postfix-3.5.6.tar.gz 4613310 BLAKE2B b7d236677cc698bb7028b39a25441c1163e65112573756da6c17b3ef64d0917f86fdcb96ab4a20f13ccee0381420301b57e1e41c3fad11d28c7ad70bd2e1f7e3 SHA512 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c
 DIST postfix-3.5.7.tar.gz 4613756 BLAKE2B 9fa7de3e6d7d20c549c6f26d77d9a0973e789f1b6650a13be08ddc35d047b0ba6e7e75dcb5749e0772cd1e821a9e2f40891c0422bc47a90be166cc937050bc52 SHA512 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2
 DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
-DIST postfix-3.6-20201104.tar.gz 4660754 BLAKE2B cffe101af56d01e9bd55992f6f12a2e1a7a4c05f0813ab4cedda2e4c4d363ac69ba4e30b8eb85bfe36419a826c94c3c37a2d48cd46307e42446d81d865e16bf9 SHA512 2653ddf5f3b07d4b1cd5931c28258859268c4c0cbb004d352d2bbfe80075a79723f55eeab2adc95cdea87e1a6f3985c6469c68aad28efe438dad16e574420462
+DIST postfix-3.6-20201212.tar.gz 4683741 BLAKE2B 9c6f1e4488c955d5760cd921a546e2f2add363c70fbca7aede45721bfb16f00dc246ad887945054f0e047c49c17a5d4390a826ca4d357c452390e1da88366397 SHA512 2473a5542189a7973a8cdb767552c1cc819607674c0bf29358adef5fd8d7b19010bd4af62e24f061c5deed8feb787962f4827ceb6958bf93437f179332cdeb83
diff --git a/mail-mta/postfix/postfix-3.6_pre20201104.ebuild b/mail-mta/postfix/postfix-3.6_pre20201212.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.6_pre20201104.ebuild
rename to mail-mta/postfix/postfix-3.6_pre20201212.ebuild
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 50e71df0457c..5f07c4a6b0c8 100644
Binary files a/mate-extra/Manifest.gz and b/mate-extra/Manifest.gz differ
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
index d6a7c0848c40..5634e8c0117e 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="amd64 ~arm ~arm64 x86"
@@ -51,9 +51,10 @@ src_configure() {
 	if use elogind || use systemd; then
 		myconf+=( --enable-systemd )
 		if use elogind; then
+			local pkgconfig="$(tc-getPKG_CONFIG)"
 			myconf+=(
-				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+				SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 			)
 		fi
 	else
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
index a489ee3adc34..a031a4ddd4c4 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit mate
+inherit mate toolchain-funcs
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -51,9 +51,10 @@ src_configure() {
 	if use elogind || use systemd; then
 		myconf+=( --enable-systemd )
 		if use elogind; then
+			local pkgconfig="$(tc-getPKG_CONFIG)"
 			myconf+=(
-				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+				SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+				SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")"
 			)
 		fi
 	else
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index a8f776bd089b..bb4f87b16807 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/cascadia-code/Manifest b/media-fonts/cascadia-code/Manifest
index 2d2b13972e25..ede503121eb8 100644
--- a/media-fonts/cascadia-code/Manifest
+++ b/media-fonts/cascadia-code/Manifest
@@ -1,3 +1 @@
-DIST cascadia-code-1909.16.tar.gz 338681 BLAKE2B a31c643773a5c51f2cd803c26ab0001c0d3272137d1679e7c2f77c05f9a35751bcd6c9f7ea6c23575d28d1312e6a3a69d6e0c64f1691817599606115ec2d54f5 SHA512 fcb2cb28250e7007e024b57d6cce8b0424b02eff016312397e25fb236e73813ba48a3561ff01c6aa2235c990aae2428ad08d49e1c2f97c0b8ea01498b3c9ec36
-DIST cascadia-code-1910.04.tar.gz 442050 BLAKE2B 61612a310b9f74cbededf060d826978d6f8c3af101e85380a4938bcaecbb0be11bb1975663d80009b14599a04f739d0aedf1d02e5467c4ed5b38708760d446e5 SHA512 2594f8bd01956cc594012746b33a5def6d68e1c365fb5ca43ee21ba19d295e3960e2434849cbb9be6d1a4b39920357b38cacd0480d7543585f616f39d6378379
-DIST cascadia-code-2004.30.zip 1003328 BLAKE2B 91eda6dffef3ba188fd1bc510f26e5043a4aea8c4c78b3bfc14c7292dfce2895785adc2e100593d4d5cec2d6db8ec35409a5ee75064b2717a900bbbee580cdd8 SHA512 f2bb331daa095926bb3fd0777f78ad5f5d483a7b4f181c9a617fb341983eefbc67116cc530f722a46c59555575384bb604fc2410452f9a9e2cbdc0aa67ca7529
+DIST cascadia-code-2009.22.zip 8217333 BLAKE2B 0c3e4cb95cae4869c911ea93e16b496e249778150fc208a04c392cd6321245e2de822953ed79346201e73dd8ad3359f6ec99b3f156f33b49b9f698413d5be568 SHA512 3ddc0b243b10fa36ffb89d7f63cce50b39bdc6b263ab124c9c34840eb7e775fc84366dffc1785b3b5cd48b1fda045f5f90d8e0301ffac754a0b7b9d8063b3d04
diff --git a/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild b/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild
deleted file mode 100644
index ee27bbcc4a30..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-1909.16.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild b/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
deleted file mode 100644
index 79feac20af1f..000000000000
--- a/media-fonts/cascadia-code/cascadia-code-1910.04.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="A monospaced font developed for Windows Terminal"
-HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/cascadia-code/cascadia-code-2004.30.ebuild b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
similarity index 90%
rename from media-fonts/cascadia-code/cascadia-code-2004.30.ebuild
rename to media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
index c1e4245535c6..ac79209160a2 100644
--- a/media-fonts/cascadia-code/cascadia-code-2004.30.ebuild
+++ b/media-fonts/cascadia-code/cascadia-code-2009.22.ebuild
@@ -3,17 +3,16 @@
 
 EAPI=7
 
+FONT_SUFFIX="ttf"
 inherit font
 
 DESCRIPTION="A monospaced font developed for Windows Terminal"
 HOMEPAGE="https://github.com/microsoft/cascadia-code"
-SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode_${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/microsoft/cascadia-code/releases/download/v${PV}/CascadiaCode-${PV}.zip -> ${P}.zip"
+S="${WORKDIR}/ttf"
 
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/ttf"
-FONT_SUFFIX="ttf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 4d1ddeaa0aad..8c14e1729b3c 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index 797a55e5dc7b..b23e4fa6b634 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,2 +1 @@
-DIST imageworsener-1.3.2.tar.gz 661710 BLAKE2B ac79b9d883be34b93e935dc813e6f1edb4806203a20d1f7663d7cbeec74d62227aa88c92b9e96cb940f2a952e92d9724f98fe69dcbd7d2a9dccc2c0a2e9d19c2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668
 DIST imageworsener-1.3.3.tar.gz 662243 BLAKE2B 6b34dc111c5b2dcc25fdc717b7ec8d4268ca1b67c31cca58b5e1983643f1e3b78543a3bdba24b3692a05cb83a887bfcf0e7b09307535994d280056a0047c8b0d SHA512 ebe8a31819cf665d8d8d7e789d873de03206e74e100ea99b2d8dc6ac2590025ff0058066daeb17ebfaa6cf49222e33c8a9efa83f39f5e2b9b49d27a3ee1b027f
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
deleted file mode 100644
index 1725bfb56b44..000000000000
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune
-
-MY_P=${PN}-src-${PV}
-MY_PN=imagew
-
-DESCRIPTION="Utility for image scaling and processing"
-HOMEPAGE="http://entropymine.com/imageworsener/"
-SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jpeg png static-libs test webp zlib"
-
-DEPEND="png? ( media-libs/libpng:0 )
-	jpeg? ( virtual/jpeg:0 )
-	webp? ( >=media-libs/libwebp-0.1.3 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="test? ( jpeg png webp zlib )"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local switch=''
-	use test && switch=test
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ${switch} jpeg) \
-		$(use_with ${switch} png) \
-		$(use_with ${switch} webp) \
-		$(use_with ${switch} zlib)
-}
-
-src_install() {
-	default
-	dodoc {changelog,readme,technical}.txt
-	prune_libtool_files
-}
-
-src_test() {
-	cd "${S}"/tests || die
-	./runtest "${S}"/${MY_PN}
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b8c0c838dbec..bba52eb80378 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
index 5c0f7d6d8e87..5d88aeb97634 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
@@ -200,8 +200,8 @@ multilib_src_configure() {
 		local PKGCONFIG="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind" 2>/dev/null)"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind" 2>/dev/null)"
+			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
+			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
 		)
 	fi
 
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 737b28abb7fb..2e67499f79dd 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -205,8 +205,8 @@ multilib_src_configure() {
 		local PKGCONFIG="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind" 2>/dev/null)"
-			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind" 2>/dev/null)"
+			SYSTEMDLOGIN_CFLAGS="$(${PKGCONFIG} --cflags "libelogind")"
+			SYSTEMDLOGIN_LIBS="$(${PKGCONFIG} --libs "libelogind")"
 		)
 	fi
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 070655dd6ded..e488e376046b 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 951acfd799b7..3c8a15189f86 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.3.tar.gz 8664187 BLAKE2B 37f026306a0601709659cfc2478e59251dd7fc1567f8b43326ddbefa55c9bfee77dc8f0f81d3e8e111e78ad9da0f4b32613d5ffbcae542a8978c49467be80db6 SHA512 4555c1fbb609b3b6d842fced374a8a6fab0bc69952f4349a1c6636964d7384001d1e6e7a91fae3715c4cf468cbfbd713f89d17e53eef6c5d69edfa158e47d8bd
-DIST makemkv-oss-1.15.3.tar.gz 6403409 BLAKE2B c02881c13236d65eba5bbc66d9191ba4b2da53e1d776c502427a02ee8b18091db90643d7e8c3f94be5b5c80c40dfc5df282daee6f69c42d32383937aba33e700 SHA512 11248f4d35a16793a13a94c92f8eef060206e95d2383da06ce7adeadcd445dc12d09bad79142169cc32e514594b2c6cacf9ab216d446eece531c849a8803f13a
+DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd SHA512 f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
+DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0 SHA512 f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f
diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
deleted file mode 100644
index 3dfe508a24a4..000000000000
--- a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
---- makemkv-oss-1.15.3~/configure	2020-10-01 13:59:27.000000000 +0000
-+++ makemkv-oss-1.15.3/configure	2020-10-03 20:49:45.588257151 +0000
-@@ -11726,7 +11726,7 @@
- ENABLE_DEBUG=$enable_debug
- 
- 
--if test -z $CXXFLAGS; then
-+if test -z "$CXXFLAGS"; then
-     CXXFLAGS='-std=c++11'
- fi
- 
diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.4.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.15.3.ebuild
rename to media-video/makemkv/makemkv-1.15.4.ebuild
index 3c81c3d3988b..643dfc37ef2a 100644
--- a/media-video/makemkv/makemkv-1.15.3.ebuild
+++ b/media-video/makemkv/makemkv-1.15.4.ebuild
@@ -50,7 +50,6 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-path.patch
-	"${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
 )
 
 src_configure() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 7f7d5982bf8b..1f5f12e699fa 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 3e36dda02b58..e6f66711a3f6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Dec 2020 10:08:32 +0000
+Tue, 15 Dec 2020 04:38:37 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3e36dda02b58..e6f66711a3f6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Dec 2020 10:08:32 +0000
+Tue, 15 Dec 2020 04:38:37 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 47abbc9d4894..2ca045c57f1e 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d3855eab8ee5..c436cc908c94 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/fangfrisch-1.3.0 b/metadata/md5-cache/app-antivirus/fangfrisch-1.3.0
new file mode 100644
index 000000000000..b42093547a62
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/fangfrisch-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/requests-2.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-1.3.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Update and verify unofficial Clam Anti-Virus signatures
+EAPI=7
+HOMEPAGE=https://github.com/rseichter/fangfrisch https://pypi.org/project/fangfrisch/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/requests-2.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-1.3.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/rseichter/fangfrisch/archive/1.3.0.tar.gz -> fangfrisch-1.3.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0a4ba87c3d125149fcc51e9dcc7fa5ad
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 1a131fb74ae2..d07b7a50a544 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/acme-sh-2.8.7 b/metadata/md5-cache/app-crypt/acme-sh-2.8.8
similarity index 81%
rename from metadata/md5-cache/app-crypt/acme-sh-2.8.7
rename to metadata/md5-cache/app-crypt/acme-sh-2.8.8
index 1c9c0159a7d6..8e5c9c5c04c4 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-2.8.7
+++ b/metadata/md5-cache/app-crypt/acme-sh-2.8.8
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3
 RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx ) virtual/cron
 SLOT=0
-SRC_URI=https://github.com/Neilpang/acme.sh/archive/2.8.7.tar.gz -> acme.sh-2.8.7.tar.gz
+SRC_URI=https://github.com/Neilpang/acme.sh/archive/2.8.8.tar.gz -> acme.sh-2.8.8.tar.gz
 _md5_=996c8316e92d90a944b7e499b2c4734c
diff --git a/metadata/md5-cache/app-crypt/glep63-check-9 b/metadata/md5-cache/app-crypt/glep63-check-9
index ad6da23c22d1..090b022b6e68 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-9
+++ b/metadata/md5-cache/app-crypt/glep63-check-9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( app-crypt/gnupg sys-libs/libfaketime ) 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(-)]
+DEPEND=test? ( app-crypt/gnupg sys-libs/libfaketime ) 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=GLEP 63 compliance checker for OpenPGP keys
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/glep63-check/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=app-crypt/gnupg 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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=app-crypt/gnupg 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 ) || ( 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/mgorny/glep63-check/archive/v9.tar.gz -> glep63-check-9.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff4a2297a7e2768616c325e840e51850
+_md5_=90d82d2d1752176b718ea283cbad9e9f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 58505e2420b2..b13a33550c8d 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/open-vm-tools-11.2.0_p16938113 b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r1
similarity index 76%
rename from metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113
rename to metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r1
index f14f9229fdbf..2c5fde9ecce7 100644
--- a/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-11.2.0_p16938113-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/glib-utils virtual/pkgconfig 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 prepare setup
-DEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev ) net-libs/rpcsvc-proto
+DEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev ) net-libs/rpcsvc-proto
 DESCRIPTION=Opensourced tools for VMware guests
 EAPI=7
 HOMEPAGE=https://github.com/vmware/open-vm-tools
 IUSE=X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
+RDEPEND=dev-libs/glib net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) fuse? ( sys-fs/fuse:0 ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl:0 ) vgauth? ( dev-libs/libxml2 dev-libs/xmlsec ) X? ( x11-libs/libXext multimon? ( x11-libs/libXinerama ) x11-libs/libXi x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst x11-libs/libSM x11-libs/libXcomposite x11-libs/gdk-pixbuf-xlib x11-libs/gtk+:3 gtkmm? ( dev-cpp/gtkmm:3.0 dev-libs/libsigc++:2 ) ) dnet? ( dev-libs/libdnet ) icu? ( dev-libs/icu:= ) resolutionkms? ( x11-libs/libdrm[video_cards_vmware] virtual/libudev )
 REQUIRED_USE=multimon? ( X ) vgauth? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-11.2.0/open-vm-tools-11.2.0-16938113.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=daefa89722ff579d10e1dfa6da824cf2
+_md5_=9a59a73a3a28086808c75a610ff0733c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.16-r1 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.16-r1
index f66795c4fec9..e0a99d28adce 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.16-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.16-r1
@@ -10,4 +10,4 @@ RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( sys-apps/kmod[tools] )
 SLOT=0/6.1
 SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.1.16.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dba431375c75a62a4d1164ba37cb1a4a
+_md5_=d3ab46942a9d0a1a53b6cab306efb626
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 1093220a6b3a..6fe886f89696 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/ca-certificates-20200601.3.60 b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.60
new file mode 100644
index 000000000000..e6854ab5ff72
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20200601.3.60
@@ -0,0 +1,13 @@
+BDEPEND=app-misc/c_rehash sys-apps/debianutils || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=7
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+IUSE=cacert
+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 ~x86-winnt
+LICENSE=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20200601.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_60_RTM/src/nss-3.60.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e20abef2f1b3aaadec0ce753ab580990
diff --git a/metadata/md5-cache/app-misc/piper-0.5.1 b/metadata/md5-cache/app-misc/piper-0.5.1
new file mode 100644
index 000000000000..f387adffaea4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/piper-0.5.1
@@ -0,0 +1,15 @@
+BDEPEND=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] ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup test
+DEPEND=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/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) dev-libs/libevdev virtual/libudev
+DESCRIPTION=GTK configuration application for libratbag
+EAPI=7
+HOMEPAGE=https://github.com/libratbag/piper
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=MIT
+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/gobject-introspection >=dev-libs/libratbag-0.13 gnome-base/librsvg[introspection] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[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/libratbag/piper/archive/0.5.1.tar.gz -> piper-0.5.1.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=b52b4f37c032e7abf7ea68e2ab0d49c1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index f381477c9fd7..6eb8260a8acb 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/bdf2psf-1.104 b/metadata/md5-cache/app-text/bdf2psf-1.104
deleted file mode 100644
index 3c1e4c1682f8..000000000000
--- a/metadata/md5-cache/app-text/bdf2psf-1.104
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converter to generate console fonts from BDF source fonts
-EAPI=5
-HOMEPAGE=http://packages.debian.org/sid/bdf2psf
-KEYWORDS=~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/console-setup/console-setup_1.104.tar.gz
-_md5_=38894710f60807f7528ac74afeb20c4a
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
similarity index 98%
rename from metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
rename to metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
index 526368faca86..992ae752de57 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r2
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.3-r4
@@ -11,4 +11,4 @@ RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >
 SLOT=0
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/ghostscript-9.53.3.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.53-patchset-01.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf8a8dc80bd4acaed2656c7d92d7fa85
+_md5_=eb9dd34a0729b7af618d6e54e7eb0379
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index 0e0dc03ebf11..353b06b9986f 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Converts simple, human readable textfiles to roff for terminal displ
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/ronn/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby25(-)] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby25(-)] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby26(-)] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby26(-)] >=dev-ruby/rdiscount-1.5.8[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ronn-0.7.3.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c61c1a576e7622265a3d707f9e5606fe
+_md5_=35c50c94e084d9a26199e8ac162c4dd5
diff --git a/metadata/md5-cache/app-text/scdoc-1.10.0 b/metadata/md5-cache/app-text/scdoc-1.10.0
deleted file mode 100644
index 295060e2854c..000000000000
--- a/metadata/md5-cache/app-text/scdoc-1.10.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Standalone tool for generating man pages with a simple syntax
-EAPI=7
-HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.10.0.tar.gz -> scdoc-1.10.0.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=27b880b5aa07b881ca9e027f6cc95ee2
diff --git a/metadata/md5-cache/app-text/scdoc-1.10.1 b/metadata/md5-cache/app-text/scdoc-1.11.1
similarity index 80%
rename from metadata/md5-cache/app-text/scdoc-1.10.1
rename to metadata/md5-cache/app-text/scdoc-1.11.1
index c156e4c5b167..7975048f3825 100644
--- a/metadata/md5-cache/app-text/scdoc-1.10.1
+++ b/metadata/md5-cache/app-text/scdoc-1.11.1
@@ -5,6 +5,6 @@ HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.10.1.tar.gz -> scdoc-1.10.1.tar.gz
+SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.11.1.tar.gz -> scdoc-1.11.1.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=03c5ca4da9d94e23b9d19912c0afcf1c
diff --git a/metadata/md5-cache/app-text/scdoc-1.9.3-r1 b/metadata/md5-cache/app-text/scdoc-1.9.3-r1
deleted file mode 100644
index 23e487d0573b..000000000000
--- a/metadata/md5-cache/app-text/scdoc-1.9.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Standalone tool for generating man pages with a simple syntax
-EAPI=7
-HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/archive/1.9.3.tar.gz -> scdoc-1.9.3.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6a95838d1d5aa3162ab7225d33da28f
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 398caa08e00b..8ef14f708e0e 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/eigen-3.3.9 b/metadata/md5-cache/dev-cpp/eigen-3.3.9
new file mode 100644
index 000000000000..fd7299b8c25e
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.9
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) test? ( virtual/pkgconfig ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/scotch sci-libs/spqr sci-libs/superlu sci-libs/umfpack virtual/opengl ) test? ( virtual/fortran )
+DESCRIPTION=C++ template library for linear algebra
+EAPI=7
+HOMEPAGE=http://eigen.tuxfamily.org/index.php?title=Main_Page
+IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e838319a782bc0532c972e2a143e19da
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index c75695407786..4088cd877aa2 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/rpi-eeprom-10.3_p1 b/metadata/md5-cache/dev-embedded/rpi-eeprom-10.3_p1
new file mode 100644
index 000000000000..98694c3cf6a1
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/rpi-eeprom-10.3_p1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/help2man virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DEPEND=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=Updater for Raspberry Pi 4 bootloader and the VL805 USB controller
+EAPI=7
+HOMEPAGE=https://github.com/raspberrypi/rpi-eeprom/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~arm ~arm64
+LICENSE=BSD rpi-eeprom
+RDEPEND=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(-)] sys-apps/flashrom || ( >=media-libs/raspberrypi-userland-0_pre20201022 >=media-libs/raspberrypi-userland-bin-1.20201022 )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_10.3-1.debian.tar.xz https://archive.raspberrypi.org/debian/pool/main/r/rpi-eeprom/rpi-eeprom_10.3.orig.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=778318ec9a5673ebde9ad45e1da393c0
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index b1eb816e2514..a0198f6cd627 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/comonad-5.0.6 b/metadata/md5-cache/dev-haskell/comonad-5.0.6
index 99d5bc42868b..07b0848fb6a5 100644
--- a/metadata/md5-cache/dev-haskell/comonad-5.0.6
+++ b/metadata/md5-cache/dev-haskell/comonad-5.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 >=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1 test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haskell 98 compatible comonads
 EAPI=7
 HOMEPAGE=https://github.com/ekmett/comonad/
-IUSE=+containers +distributive +test-doctests doc hscolour profile test
+IUSE=+test-doctests doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:= distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+RDEPEND=>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] >=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=0/5.0.6
 SRC_URI=https://hackage.haskell.org/package/comonad-5.0.6/comonad-5.0.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb72291c2f3b91a1695192cce05d51d3
+_md5_=51e06c930d266ccf09954a9c7d1a33fe
diff --git a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2 b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
similarity index 91%
rename from metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2
rename to metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
index caa720d5d3a4..a5a272f93b1e 100644
--- a/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2
+++ b/metadata/md5-cache/dev-haskell/wai-app-static-3.1.7.2-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/mockery dev-haskell/network dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-1.3 dev-haskell/mockery dev-haskell/network dev-haskell/temporary ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=WAI application for static serving
 EAPI=7
 HOMEPAGE=https://www.yesodweb.com/book/web-application-interface
 IUSE=print doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
+RDEPEND=>=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/cryptonite-0.6:=[profile?] >=dev-haskell/file-embed-0.0.3.1:=[profile?] dev-haskell/http-date:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] >=dev-haskell/memory-0.7:=[profile?] >=dev-haskell/mime-types-0.1:=[profile?] <dev-haskell/mime-types-0.2:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] >=dev-haskell/optparse-applicative-0.7:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?] >=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=!test? ( test )
 SLOT=0/3.1.7.2
 SRC_URI=https://hackage.haskell.org/package/wai-app-static-3.1.7.2/wai-app-static-3.1.7.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=76b2e2543704b3c29c48cf45e66ea5ac
+_md5_=5e2c8cd8da9def44b3a13dd85be326ec
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.0.31 b/metadata/md5-cache/dev-haskell/wai-extra-3.0.31
deleted file mode 100644
index 10b345a351fd..000000000000
--- a/metadata/md5-cache/dev-haskell/wai-extra-3.0.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= examples? ( dev-haskell/warp:=[profile?] ) >=dev-haskell/cabal-1.22.2.0 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Provides some basic WAI handlers and middleware
-EAPI=7
-HOMEPAGE=https://github.com/yesodweb/wai
-IUSE=examples doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.10.1:= examples? ( dev-haskell/warp:=[profile?] )
-RESTRICT=!test? ( test )
-SLOT=0/3.0.31
-SRC_URI=https://hackage.haskell.org/package/wai-extra-3.0.31/wai-extra-3.0.31.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1c8874909c49afb200da540ae6ccd99f
diff --git a/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1 b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
new file mode 100644
index 000000000000..994ba5b45bac
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/wai-extra-3.1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.2.1:= examples? ( dev-haskell/warp:=[profile?] ) >=dev-haskell/cabal-2.0.0.2 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Provides some basic WAI handlers and middleware
+EAPI=7
+HOMEPAGE=https://github.com/yesodweb/wai
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-haskell/aeson:=[profile?] dev-haskell/ansi-terminal:=[profile?] dev-haskell/base64-bytestring:=[profile?] dev-haskell/call-stack:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] dev-haskell/cookie:=[profile?] dev-haskell/data-default-class:=[profile?] >=dev-haskell/fast-logger-2.4.5:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/http2:=[profile?] dev-haskell/hunit:=[profile?] dev-haskell/iproute:=[profile?] >=dev-haskell/network-2.6.1.0:=[profile?] >=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/resourcet-0.4.6:=[profile?] <dev-haskell/resourcet-1.3:=[profile?] >=dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/vault:=[profile?] >=dev-haskell/void-0.5:=[profile?] >=dev-haskell/wai-3.0.3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?] >=dev-haskell/wai-logger-2.3.2:=[profile?] dev-haskell/word8:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-8.2.1:= examples? ( dev-haskell/warp:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/3.1.4.1
+SRC_URI=https://hackage.haskell.org/package/wai-extra-3.1.4.1/wai-extra-3.1.4.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=96dc7ffaccc4ac2551d0c0e6a981e3f1
diff --git a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.7 b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
similarity index 97%
rename from metadata/md5-cache/dev-haskell/yesod-core-1.6.18.7
rename to metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
index be81704751c2..ec43f83e483d 100644
--- a/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.7
+++ b/metadata/md5-cache/dev-haskell/yesod-core-1.6.18.8
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/aeson-1.0:=[profile?] dev-haskell/auto-update:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7.1:=[profile?] >=dev-haskell/case-insensitive-0.2:=[profile?] >=dev-haskell/cereal-0.3:=[profile?] >=dev-haskell/clientsession-0.9.1:=[profile?] <dev-haskell/clientsession-0.10:=[profile?] >=dev-haskell/conduit-1.3:=[profile?] dev-haskell/conduit-extra:=[profile?] >=dev-haskell/cookie-0.4.3:=[profile?] <dev-haskell/cookie-0.5:=[profile?] >=dev-haskell/fast-logger-2.2:=[profile?] >=dev-haskell/http-types-0.7:=[profile?] dev-haskell/memory:=[profile?] >=dev-haskell/monad-logger-0.3.10:=[profile?] <dev-haskell/monad-logger-0.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/path-pieces-0.1.2:=[profile?] <dev-haskell/path-pieces-0.3:=[profile?] >=dev-haskell/primitive-0.6:=[profile?] >=dev-haskell/random-1.0.0.2:=[profile?] <dev-haskell/random-1.3:=[profile?] >=dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/shakespeare-2.0:=[profile?] >=dev-haskell/text-0.7:=[profile?] dev-haskell/unix-compat:=[profile?] dev-haskell/unliftio:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] >=dev-haskell/vector-0.9:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/wai-3.2:=[profile?] >=dev-haskell/wai-extra-3.0.7:=[profile?] >=dev-haskell/wai-logger-0.2:=[profile?] >=dev-haskell/warp-3.0.2:=[profile?] dev-haskell/word8:=[profile?] >=dev-lang/ghc-8.2.1:=
 RESTRICT=test
-SLOT=0/1.6.18.7
-SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.18.7/yesod-core-1.6.18.7.tar.gz
+SLOT=0/1.6.18.8
+SRC_URI=https://hackage.haskell.org/package/yesod-core-1.6.18.8/yesod-core-1.6.18.8.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a89d8d965729f50a3e2fa9fc9d2b0e29
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 4b65c7c52876..10f91cd2a888 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2 b/metadata/md5-cache/dev-java/antlr-3.5.2
deleted file mode 100644
index 03134663e195..000000000000
--- a/metadata/md5-cache/dev-java/antlr-3.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test unpack
-DEPEND=dev-java/stringtemplate:4 >=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A parser generator for many languages
-EAPI=5
-HOMEPAGE=https://www.antlr3.org/
-IUSE=doc test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=3.5
-SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9df5afc9375a3714ac6988c6f2d066af
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2-r1 b/metadata/md5-cache/dev-java/antlr-3.5.2-r1
new file mode 100644
index 000000000000..83cdff2e5164
--- /dev/null
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/stringtemplate:4 >=virtual/jdk-1.8 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A parser generator for many languages
+EAPI=7
+HOMEPAGE=https://www.antlr3.org/
+IUSE=doc test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=!test? ( test )
+SLOT=3.5
+SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz https://www.antlr3.org/download/antlr-3.5.2-complete.jar
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b4a545ed17335d0da2e16d8b30d47ac5
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f4e10f2ae12a..f96b3f85ea9b 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/php-7.2.33 b/metadata/md5-cache/dev-lang/php-7.2.33
index d7e28f700b62..d4087575e5d6 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.33
+++ b/metadata/md5-cache/dev-lang/php-7.2.33
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://www.php.net/distributions/php-7.2.33.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f061165fea264122a267d0e894c9a9c8
+_md5_=553d9069c4a802e16c63d842a963dd49
diff --git a/metadata/md5-cache/dev-lang/php-7.2.34 b/metadata/md5-cache/dev-lang/php-7.2.34
index 30b27bac6278..45d5aa43d194 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.34
+++ b/metadata/md5-cache/dev-lang/php-7.2.34
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://www.php.net/distributions/php-7.2.34.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f061165fea264122a267d0e894c9a9c8
+_md5_=553d9069c4a802e16c63d842a963dd49
diff --git a/metadata/md5-cache/dev-lang/php-7.3.21 b/metadata/md5-cache/dev-lang/php-7.3.21
index 5ca6a57586e0..8e36d2272789 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.21
+++ b/metadata/md5-cache/dev-lang/php-7.3.21
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.3
 SRC_URI=https://www.php.net/distributions/php-7.3.21.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92175fd1a3bc69fc316a5a048f70f31d
+_md5_=bb14e64e5a4f24fbab041ce5083a270d
diff --git a/metadata/md5-cache/dev-lang/php-7.3.23 b/metadata/md5-cache/dev-lang/php-7.3.23
index f8b0d3d38f86..40442935abde 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.23
+++ b/metadata/md5-cache/dev-lang/php-7.3.23
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.3
 SRC_URI=https://www.php.net/distributions/php-7.3.23.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92175fd1a3bc69fc316a5a048f70f31d
+_md5_=bb14e64e5a4f24fbab041ce5083a270d
diff --git a/metadata/md5-cache/dev-lang/php-7.4.11 b/metadata/md5-cache/dev-lang/php-7.4.11
index f2cf2e99b122..928f3fb1f955 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.11
+++ b/metadata/md5-cache/dev-lang/php-7.4.11
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.4
 SRC_URI=https://www.php.net/distributions/php-7.4.11.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3853da96e3a6679430e9eeb3f9fe5da1
+_md5_=a6b67f7eb4d91a978c7aa9b018ad0888
diff --git a/metadata/md5-cache/dev-lang/php-7.4.9 b/metadata/md5-cache/dev-lang/php-7.4.9
index f83a463dae75..5686c89d4900 100644
--- a/metadata/md5-cache/dev-lang/php-7.4.9
+++ b/metadata/md5-cache/dev-lang/php-7.4.9
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://www.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.4
 SRC_URI=https://www.php.net/distributions/php-7.4.9.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3853da96e3a6679430e9eeb3f9fe5da1
+_md5_=a6b67f7eb4d91a978c7aa9b018ad0888
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18-r5 b/metadata/md5-cache/dev-lang/python-2.7.18-r5
new file mode 100644
index 000000000000..8abb9eb90559
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-2.7.18-r5
@@ -0,0 +1,15 @@
+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 prepare setup test
+DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) 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 ) !<=dev-lang/python-exec-2.4.6-r1
+SLOT=2.7
+SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r4.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=405c539ec9eb0f11e30c96d3bf933be0
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_alpha3 b/metadata/md5-cache/dev-lang/python-3.10.0_alpha3
new file mode 100644
index 000000000000..d8dd5e069e87
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_alpha3
@@ -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 prepare pretend setup 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.10
+SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0a3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0a1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3e2213bf7277ed78a37f91c1d56f7585
diff --git a/metadata/md5-cache/dev-lang/python-3.6.12-r1 b/metadata/md5-cache/dev-lang/python-3.6.12-r1
new file mode 100644
index 000000000000..dda79152cdb2
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.6.12-r1
@@ -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-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 +threads tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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-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.6/3.6m
+SRC_URI=https://www.python.org/ftp/python/3.6.12/Python-3.6.12.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.12-r1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=907668ecb6723ba5ad20e451aa4a0208
diff --git a/metadata/md5-cache/dev-lang/python-3.7.9-r1 b/metadata/md5-cache/dev-lang/python-3.7.9-r1
new file mode 100644
index 000000000000..113a321712a7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.7.9-r1
@@ -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.9/Python-3.7.9.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.9-r1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6a9c15f77d7b8159624916c82e5757ce
diff --git a/metadata/md5-cache/dev-lang/python-3.8.6-r1 b/metadata/md5-cache/dev-lang/python-3.8.6-r1
new file mode 100644
index 000000000000..5e23ff2e8104
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.6-r1
@@ -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.8
+SRC_URI=https://www.python.org/ftp/python/3.8.6/Python-3.8.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.6-r1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=651b72351ac065eb13a47a02b9e30d5c
diff --git a/metadata/md5-cache/dev-lang/python-3.8.7_rc1 b/metadata/md5-cache/dev-lang/python-3.8.7_rc1
new file mode 100644
index 000000000000..287b8e937a73
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.7_rc1
@@ -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.8
+SRC_URI=https://www.python.org/ftp/python/3.8.7/Python-3.8.7rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.6.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1d213c8581691dff60bf77b2c67caa12
diff --git a/metadata/md5-cache/dev-lang/python-3.9.0-r1 b/metadata/md5-cache/dev-lang/python-3.9.0-r1
new file mode 100644
index 000000000000..cedd4976bbe5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.0-r1
@@ -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 prepare pretend setup 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.9
+SRC_URI=https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0-r1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2e988c9f55deeddb44952264fa1ba9da
diff --git a/metadata/md5-cache/dev-lang/python-3.9.1 b/metadata/md5-cache/dev-lang/python-3.9.1
new file mode 100644
index 000000000000..3b8e5bfc832c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.1
@@ -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 prepare pretend setup 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.9
+SRC_URI=https://www.python.org/ftp/python/3.9.1/Python-3.9.1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.0rc1.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bc08c5eb06211bc961dc92893a3c9bcb
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.6.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.6.0
new file mode 100644
index 000000000000..bb4e788e4f4f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.6.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=virtual/rust-1.41.0 virtual/pkgconfig || ( ( sys-devel/llvm:11 clang? ( sys-devel/clang:11 lto? ( =sys-devel/lld-11* ) ) ) ( sys-devel/llvm:10 clang? ( sys-devel/clang:10 lto? ( =sys-devel/lld-10* ) ) ) ( sys-devel/llvm:9 clang? ( sys-devel/clang:9 lto? ( =sys-devel/lld-9* ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) >=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.13 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3 test? ( || ( ( dev-lang/python:3.9 dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) !!sys-devel/llvm:0
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+IUSE=+clang cpu_flags_arm_neon debug +jit lto test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
+RESTRICT=!test? ( test )
+SLOT=78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/source/firefox-78.6.0esr.source.tar.xz -> firefox-78.6.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-03.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b972ff470e65d7f2ff98233ba307f87a
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index eb47f4714601..bf61a6b5bb1d 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/leatherman-1.12.3 b/metadata/md5-cache/dev-libs/leatherman-1.12.3
index d57570e1b568..1153aa17da17 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.3
+++ b/metadata/md5-cache/dev-libs/leatherman-1.12.3
@@ -5,11 +5,11 @@ DESCRIPTION=A C++ toolkit
 EAPI=7
 HOMEPAGE=https://github.com/puppetlabs/leatherman
 IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=net-misc/curl
 RESTRICT=test
 SLOT=0/1.12.3
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.3.tar.gz -> leatherman-1.12.3.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08a4f38990ebf288dd7e3a8f297b2b35
+_md5_=24623901e0232ae4cd6cbbd2a64a0a8b
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.15 b/metadata/md5-cache/dev-libs/libratbag-0.15
new file mode 100644
index 000000000000..220ca642b71a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libratbag-0.15
@@ -0,0 +1,16 @@
+BDEPEND=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-lang/swig virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-libs/gobject-introspection dev-util/valgrind python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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] ) acct-group/plugdev dev-libs/gobject-introspection dev-libs/libevdev virtual/libudev python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Library to configure gaming mice
+EAPI=7
+HOMEPAGE=https://github.com/libratbag/libratbag
+IUSE=doc elogind systemd test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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] ) acct-group/plugdev dev-libs/gobject-introspection dev-libs/libevdev virtual/libudev python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-evdev[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-evdev[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-evdev[python_targets_python3_8(-)] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/libratbag/libratbag/archive/v0.15.tar.gz -> libratbag-0.15.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=8551db2619c281fc2bed5d5004e8f62d
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
deleted file mode 100644
index 95649856bdf2..000000000000
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
-DESCRIPTION=Library to configure gaming mice
-EAPI=6
-HOMEPAGE=https://github.com/libratbag/libratbag
-IUSE=doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libevdev virtual/libudev
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=7a74f4d80f94d6fa4dde189f47089346
diff --git a/metadata/md5-cache/dev-libs/nss-3.60 b/metadata/md5-cache/dev-libs/nss-3.60
new file mode 100644
index 000000000000..03ecf5eb411d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.60
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=https://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_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.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_60_RTM/src/nss-3.60.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=57ad9f60dec8dc0479bf244bd24b17bb
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.11.1 b/metadata/md5-cache/dev-libs/pugixml-1.11.2
similarity index 93%
rename from metadata/md5-cache/dev-libs/pugixml-1.11.1
rename to metadata/md5-cache/dev-libs/pugixml-1.11.2
index 291772a31d00..8a32d62adde7 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.11.1
+++ b/metadata/md5-cache/dev-libs/pugixml-1.11.2
@@ -6,6 +6,6 @@ HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.1/pugixml-1.11.1.tar.gz
+SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.11.2/pugixml-1.11.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2aa12b32accf74839077af7f56ec3880
+_md5_=f6bdb2bd8e389a077289fee9ae59133f
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.7.0-r3 b/metadata/md5-cache/dev-libs/simdjson-0.7.1
similarity index 91%
rename from metadata/md5-cache/dev-libs/simdjson-0.7.0-r3
rename to metadata/md5-cache/dev-libs/simdjson-0.7.1
index ccfb66ff97cb..d695ca390ae5 100644
--- a/metadata/md5-cache/dev-libs/simdjson-0.7.0-r3
+++ b/metadata/md5-cache/dev-libs/simdjson-0.7.1
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 Boost-1.0
 REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/4
-SRC_URI=https://github.com/simdjson/simdjson/archive/v0.7.0.tar.gz -> simdjson-0.7.0.tar.gz
+SRC_URI=https://github.com/simdjson/simdjson/archive/v0.7.1.tar.gz -> simdjson-0.7.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b5c09d761e0dd99b30957c28dd51200
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 76c9eca6da52..2027b2db9d8c 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/ecls-20.4.24 b/metadata/md5-cache/dev-lisp/ecls-20.4.24
index 2bb071d78f8e..b69821e17e33 100644
--- a/metadata/md5-cache/dev-lisp/ecls-20.4.24
+++ b/metadata/md5-cache/dev-lisp/ecls-20.4.24
@@ -4,11 +4,11 @@ DESCRIPTION=ECL is an embeddable Common Lisp implementation
 EAPI=6
 HOMEPAGE=https://common-lisp.net/project/ecl/
 IUSE=cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=BSD-2 LGPL-2.1+
 RDEPEND=dev-libs/gmp:0 dev-libs/libffi libatomic? ( dev-libs/libatomic_ops ) >=dev-libs/boehm-gc-7.1[threads?] >=dev-lisp/asdf-2.33-r3:=
 RESTRICT=test
 SLOT=0/20.4.24
 SRC_URI=https://common-lisp.net/project/ecl/static/files/release/ecl-20.4.24.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=622117cf54e9bab623a53b9c95c49209
+_md5_=09a66934c8be3f9b353f9e1004875156
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r101 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r101
deleted file mode 100644
index 8a32e35dc4e8..000000000000
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
-DESCRIPTION=Bit Operations Library for the Lua Programming Language
-EAPI=7
-HOMEPAGE=http://bitop.luajit.org
-IUSE=test lua_targets_lua5-1 lua_targets_lua5-2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fed2a800231ff845f905a2d62c3ddc86
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
new file mode 100644
index 000000000000..f9c695594d23
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r102
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
+DESCRIPTION=Bit Operations Library for the Lua Programming Language
+EAPI=7
+HOMEPAGE=http://bitop.luajit.org
+IUSE=test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=38a82d817e10df7361b1e5e5fdc6aa34
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index dcafe3031525..9cb36b18fead 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r101 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r101
deleted file mode 100644
index 4b52d3620b53..000000000000
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r101
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
-EAPI=7
-HOMEPAGE=https://matthewwild.co.uk/projects/luaexpat/
-IUSE=lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
-SLOT=0
-SRC_URI=https://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=52ee3c9487989aa21bdea240dd0b2c6f
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
new file mode 100644
index 000000000000..9089382ddd78
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r102
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
+EAPI=7
+HOMEPAGE=https://matthewwild.co.uk/projects/luaexpat/
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=60e9d62801ffef088b4b1c31ad24c57a
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r101 b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r101
deleted file mode 100644
index 1747fa8b90b4..000000000000
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r101
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
-EAPI=7
-HOMEPAGE=https://github.com/tomasguisasola/luaexpat
-IUSE=lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
-SLOT=0
-SRC_URI=https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz -> luaexpat-1.3.3.tar.gz
-_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40382effb2d5406d0c1221ee57395fd8
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102 b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
new file mode 100644
index 000000000000..07544ac57149
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.3-r102
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=LuaExpat is a SAX XML parser based on the Expat library
+EAPI=7
+HOMEPAGE=https://github.com/tomasguisasola/luaexpat
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz -> luaexpat-1.3.3.tar.gz
+_eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a8fc321770bcfea7ef5fc5ca5428a14b
diff --git a/metadata/md5-cache/dev-lua/luasec-0.9-r102 b/metadata/md5-cache/dev-lua/luasec-0.9-r102
index 1959f6b7b170..47c7aed24607 100644
--- a/metadata/md5-cache/dev-lua/luasec-0.9-r102
+++ b/metadata/md5-cache/dev-lua/luasec-0.9-r102
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-lua/luasocket[lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
+DEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] )
 DESCRIPTION=Lua binding for OpenSSL library to provide TLS/SSL communication
 EAPI=7
 HOMEPAGE=https://github.com/brunoos/luasec
-IUSE=libressl lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+IUSE=libressl lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-lua/luasocket[lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated] )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RDEPEND=dev-lua/luasocket[lua_targets_luajit(-)?,lua_targets_lua5-1(-)?,lua_targets_lua5-2(-)?,lua_targets_lua5-3(-)?] libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_targets_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_targets_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_targets_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_targets_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
 SLOT=0
 SRC_URI=https://github.com/brunoos/luasec/archive/v0.9.tar.gz -> luasec-0.9.tar.gz
 _eclasses_=lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=55fe846c6f399fdfb5a50e4cf02de72f
+_md5_=e95869049e9dc6a48da1b57a797ba212
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328
deleted file mode 100644
index 6b568018e58c..000000000000
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Networking support library for the Lua language
-EAPI=7
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1d19913b563f776ad25bf698744eba7d
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r1 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r1
new file mode 100644
index 000000000000..5b6f8b773d2a
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+DESCRIPTION=Networking support library for the Lua language
+EAPI=7
+HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
+IUSE=luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1268bbde83a3d13d69404f11c0598a29
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r101 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r101
deleted file mode 100644
index a15a99edcbe6..000000000000
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r101
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-DESCRIPTION=Networking support library for the Lua language
-EAPI=7
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
-IUSE=lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
-REQUIRED_USE=|| ( lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9199cbcdb7c31f4e1e22125c733ef4ff
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
new file mode 100644
index 000000000000..298efeb90e38
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1_p20200328-r102
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=Networking support library for the Lua language
+EAPI=7
+HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/ https://github.com/diegonehab/luasocket
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/diegonehab/luasocket/archive/5b18e475f38fcf28429b1cc4b17baee3b9793a62.tar.gz -> luasocket-3.0_rc1_p20200328.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a81139de9d13fb076260482dfe63052d
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.3.4 b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
index f5cb5a368182..f006e82abff0 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.3.4
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.3.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
 EAPI=6
 HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
-KEYWORDS=amd64 hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http:///get/File_Iterator-1.3.4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=8a2a9c6ed418ed8a65f5ab3ddf10ab6e
+_md5_=5e286f5288f75f37fb2e64c1b2f0f03f
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.4.2 b/metadata/md5-cache/dev-php/File_Iterator-1.4.2
index 953ad89a503a..2908f2aff64e 100644
--- a/metadata/md5-cache/dev-php/File_Iterator-1.4.2
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.4.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=FilterIterator implementation that filters files based on criteria
 EAPI=6
 HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.2.tar.gz -> File_Iterator-1.4.2.tar.gz
-_md5_=58400448cb29fc35842c8b7852267bb6
+_md5_=51fa15abe8d3e0abc7b35a399d364a2b
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index e3af02432db0..ca0dedc14576 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-Archive_Tar-1.4.11 b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.11
index 385719e35d16..80adccdc0a11 100644
--- a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.11
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Tar file management class
 EAPI=7
 HOMEPAGE=https://pear.php.net/package/Archive_Tar
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*[bzip2,pcre(+),zlib]
 SLOT=0
 SRC_URI=https://pear.php.net/get/Archive_Tar-1.4.11.tgz
-_md5_=64bc04c2fffccbdbf9ee4183cb2af275
+_md5_=d5289d07d1fdfd4b94721066e4d9aea8
diff --git a/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0 b/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
index 9890ec4fd862..8a9602dcb78d 100644
--- a/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
+++ b/metadata/md5-cache/dev-php/PEAR-Auth_SASL-1.1.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Abstraction of various SASL mechanism responses
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Auth_SASL
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Auth_SASL-1.1.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=086568155057a7bd963d496ad6c91197
+_md5_=8eb0363131770b82f3b48c0073e8d692
diff --git a/metadata/md5-cache/dev-php/PEAR-Cache-1.5.6-r2 b/metadata/md5-cache/dev-php/PEAR-Cache-1.5.6-r2
index b2266f38ec6e..1ec2b04b9fe2 100644
--- a/metadata/md5-cache/dev-php/PEAR-Cache-1.5.6-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Cache-1.5.6-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Framework for caching of arbitrary data
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Cache
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-2.02
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Cache-1.5.6.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=11c8b158af5500780c336116535f692c
+_md5_=a6a19b55ec680d053fe2472ce4780a57
diff --git a/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2 b/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2
index 194611547c56..6fabac2c5f38 100644
--- a/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2
+++ b/metadata/md5-cache/dev-php/PEAR-Cache_Lite-1.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast and safe little cache system
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Cache_Lite
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Cache_Lite-1.8.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=962fc624fb9541a05b371a699f1faba1
+_md5_=4e32f27c438e04beffd01893203fb45b
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2 b/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
index bee743082329..2cce689d1663 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
+++ b/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=A full-featured command-line options and arguments parser
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Console_CommandLine
 IUSE=examples test
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Console_CommandLine-1.2.2.tgz
-_md5_=016192ef74e7624adc2635d14d55b2b4
+_md5_=24b44462aa16990a02e5576c2231beac
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
index 515958a73f23..8e8d31572129 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Command-line option parser
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Console_Getopt
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Getopt-1.4.1.tgz
-_md5_=0c3abbf4c394034f1b9c4b07b2d8a888
+_md5_=8f1e27d66f52c29c0f456ee2633958ea
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
index ead370ada67e..2f53f2b29c91 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Table-1.3.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Class that makes it easy to build console style tables
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Console_Table
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Table-1.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=9c9fa7f6f63ded08fa03b4f5a2c18ce8
+_md5_=d6d9ea2aad1a1485b4788653d4c74f44
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
index 4c232d9190f8..152dbb58fe5f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=PHP interface to the GNU Privacy Guard (GnuPG)
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Crypt_GPG
 IUSE=test
-KEYWORDS=amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.2.tgz
-_md5_=64b7980a92973f1446cf19959f6caad1
+_md5_=d16fe334c5287b8fafd4cdb6ab9b9975
diff --git a/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1 b/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
index 1dc2a07bec1e..1c90e0ffbbf7 100644
--- a/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-DB-1.9.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Database abstraction layer for PHP
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/DB
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/DB-1.9.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=a826bdc1e900739bea5841da2593e165
+_md5_=0a549b94babd046c387edcbc6cc09492
diff --git a/metadata/md5-cache/dev-php/PEAR-Date-1.5.0_alpha4-r1 b/metadata/md5-cache/dev-php/PEAR-Date-1.5.0_alpha4-r1
index 760902101f1f..01e2f99cb2fa 100644
--- a/metadata/md5-cache/dev-php/PEAR-Date-1.5.0_alpha4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Date-1.5.0_alpha4-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Date and Time Zone classes
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Date
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Date-1.5.0a4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=cff410600d1d8ca55243a0aa9a42a7c4
+_md5_=76007df852e697111b3364be02786ae6
diff --git a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index 9db475da4735..6c8e79f640b6 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=The PEAR Exception base class
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/PEAR_Exception
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=182bec7b3cb6b4b4f0951acd2c5fd6f8
+_md5_=ae1010a8a5341b2b9b0551063fad121f
diff --git a/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
index 294f1188359a..e5eae12c5a61 100644
--- a/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Common file and directory routines
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/File
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/File-1.4.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=8db3c1b92923880a1ae5da052f85345f
+_md5_=c40d97da02aeb21fcca5bb97753c5528
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3 b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
index bde5807e85fd..cbce0ea9c9e6 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
+++ b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=A class that facillitates the search of filesystems
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/File_Find
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/File_Find-1.3.3.tgz
-_md5_=c79036068962a6407d5da2b5ed1b2a48
+_md5_=3274bb38339f7f9f12eeffe27b8fbff4
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Gettext-0.4.2-r1 b/metadata/md5-cache/dev-php/PEAR-File_Gettext-0.4.2-r1
index 8abdedcf535c..0eefdc59a962 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Gettext-0.4.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File_Gettext-0.4.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=GNU Gettext file parser
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/File_Gettext
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/File_Gettext-0.4.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=c1a79c9adcd8a32bea97b73ccc02a8b5
+_md5_=aa7e7942935815e13e38d59e6ccb8d25
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Common-1.2.5-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Common-1.2.5-r1
index cc8e2eac1214..852c6dfd3feb 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Common-1.2.5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Common-1.2.5-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Base class for other HTML classes
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Common
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Common-1.2.5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=1676a05c372e6b4030c458760c183ccd
+_md5_=f44a850e3ead06c58db658735de6bd55
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
index 9fa1f234c39a..987440c810f1 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Javascript-1.1.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Provides an interface for creating simple JS scripts within PHP
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Javascript
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Javascript-1.1.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=834c59a59f8b57a880e3ed1d6b5e09fe
+_md5_=ab920670587e7f56a25abfbb9b7048fe
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
index 4856d4a8c801..c5904b7a4024 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Table-1.8.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Makes the design of HTML tables easy, flexible, reusable and efficie
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Table
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-HTML_Common-1.2.3 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Table-1.8.4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=b137990c672a61865c7623cd70e4b25e
+_md5_=74fbe61b013b653097b6f3c60de48a66
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
index 049f503cd27b..a94e45fee01b 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Autofill a table with data
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Table_Matrix
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=PHP-3
 RDEPEND=>=dev-php/PEAR-HTML_Table-1.5-r1 >=dev-php/PEAR-Numbers_Words-0.13.1-r1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Table_Matrix-1.0.10.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=d210ea2c64ab0cedc4be15fd5878cfb1
+_md5_=85634530e10bd38e247dc888b847197c
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13 b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
index ddc811bd0abb..217eac1381a3 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Flexy-1.3.13
@@ -3,10 +3,10 @@ DESCRIPTION=An extremely powerful Tokenizer driven Template engine
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Template_Flexy
 IUSE=minimal
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-2.02
 RDEPEND=!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1 dev-php/PEAR-File_Gettext ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Template_Flexy-1.3.13.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0d4c91cc8a3599968a0f771261acd90b
+_md5_=351a1ec2c0a279c5330e5ce06add311c
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
index f0edad06f6cd..3870ee89d4d7 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of Integrated Templates API with template 'compila
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTML_Template_Sigma
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:*[ctype] >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTML_Template_Sigma-1.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=562e68b201c7c3b70638516b95180323
+_md5_=290e22983f416d556a5a088a9bc1339a
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3 b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
index b8969904c925..b68782ed44b9 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Miscellaneous HTTP utilities
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTTP
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP-1.4.1.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	php-pear-r2	479e8a084e98f4d730da647bba3e589e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7363b43d275387708695dbe5ac580621
+_md5_=65189fa58f51670444c4b411fa248111
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1 b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
index 964ab9078f1b..15bc17e03773 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP_Request2-2.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides an easy way to perform HTTP requests
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/HTTP_Request2
 IUSE=+curl +fileinfo +ssl test +zlib
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/HTTP_Request2-2.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=9e5d8c3ed9112e863d50fc4c780bcc7c
+_md5_=38fe82bf3556cd88f023abe771bf095d
diff --git a/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104 b/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
index 4504694a57d0..4b9877c424b7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
+++ b/metadata/md5-cache/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
@@ -4,11 +4,11 @@ DESCRIPTION=PHP interface to AT&T's GraphViz tools
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Image_GraphViz
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~sparc x86
 LICENSE=PHP-3
 RDEPEND=media-gfx/graphviz >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/Image_GraphViz/archive/3f8a01ae0597ca9d1d08a6e442cb0b153358fc0d.tar.gz -> Image_GraphViz-1.3.0_p20151104.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=1f1d831556c448c772870d716eaa75d6
+_md5_=9577f46fc324d99e7369807d9d309865
diff --git a/metadata/md5-cache/dev-php/PEAR-Image_IPTC-1.0.2-r2 b/metadata/md5-cache/dev-php/PEAR-Image_IPTC-1.0.2-r2
index b825a08f1678..578becc135d8 100644
--- a/metadata/md5-cache/dev-php/PEAR-Image_IPTC-1.0.2-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Image_IPTC-1.0.2-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=This package provides a mechanism for modifying IPTC header information
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Image_IPTC
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-2.02
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Image_IPTC-1.0.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=8faa48d46f8ea9d994927e4fce59c74d
+_md5_=06aff1e4b2ce377258bdfe6b17e5b8e9
diff --git a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1 b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
index 9ff19f1ec9a2..34b88595e5cb 100644
--- a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
+++ b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Log framework provides an abstracted logging system
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Log
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-DB dev-php/PEAR-Mail dev-php/PEAR-MDB2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Log-1.13.1.tgz
-_md5_=a4a9be970672721041c315132b3a2e64
+_md5_=14f30ab9c6d063913174f6dac7bb5e1f
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB-1.3.0-r2 b/metadata/md5-cache/dev-php/PEAR-MDB-1.3.0-r2
index ead4d178bf13..e0742975d819 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB-1.3.0-r2
+++ b/metadata/md5-cache/dev-php/PEAR-MDB-1.3.0-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=PEAR MDB combines the PEAR DB and Metabase php database abstraction layers
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/MDB
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/PEAR-XML_Parser >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB-1.3.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=edd3c3cbcfde42fe7b240ccad2a97057
+_md5_=e1478dc097ff0654156cd53d21746b78
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2 b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2
index 6461162a9511..0136ec60543a 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r2
@@ -3,11 +3,11 @@ DESCRIPTION=Database Abstraction Layer
 EAPI=7
 HOMEPAGE=https://pear.php.net/package/MDB2
 IUSE=mssql mysql mysqli oci8 oci8-instant-client postgres sqlite
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 ) mysql? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 ) mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 ) oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )
 RDEPEND=>=dev-php/PEAR-PEAR-1.9.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2-2.5.0b5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=81236065beec7969af22d687fa21fd03
+_md5_=bee99d53d9f05aa15ad0ca657dec7be4
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
index dbee59332cd9..998f23b42ce3 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Database Abstraction Layer, mssql driver
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/MDB2_Driver_mssql
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mssql] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_mssql-1.5.0b4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=8b840b59a9751c756617b0af602f2971
+_md5_=996d503f8849acafa1486615fd9ad625
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
index 56e22a5faa8b..afba6e1baa68 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Database Abstraction Layer, mysqli driver
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/MDB2_Driver_mysqli
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mysqli(-)] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_mysqli-1.5.0b4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=291970c2cfeb0d59a058c8670ab454d9
+_md5_=d4dd85a312fb8aa47248ce9c97ff1f18
diff --git a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1 b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
index 1a61d402fcea..1e1cb60aa774 100644
--- a/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
+++ b/metadata/md5-cache/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Database Abstraction Layer, pgsql driver
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/MDB2_Driver_pgsql
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[postgres(-)] >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/MDB2_Driver_pgsql-1.5.0b4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=dcf98146cd6e9191bdbe9259bc9488d4
+_md5_=2f7d85ca811368dff25174170521af11
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
index 419d8ee3d599..dedf93ddf428 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail-1.4.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Class that provides multiple interfaces for sending emails
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Mail
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Net_SMTP-1.4.1 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail-1.4.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=89da6c86a6289ea2a15fba21342393aa
+_md5_=de430e679b5ea9408b73e2d2fcfb6498
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1 b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
index edd25296f922..df28db08f347 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_Mime-1.10.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Create and manipulate mime messages with PHP
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Mail_Mime
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+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.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=0216e69ffa4815918725626064607c1f
+_md5_=2e3e3d6cc34a38327404efad06f40baa
diff --git a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2 b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
index 81659068d0be..fadf3c021770 100644
--- a/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a class to decode mime messages (split from PEAR-Mail_Mime)
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Mail_mimeDecode
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Mail_Mime-1.5.2 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Mail_mimeDecode-1.5.6.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=5b5f98a84835b2b79c9ce1b852e26224
+_md5_=d2c8a6f21f5ee4344f56ea069103725c
diff --git a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1 b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
index c6d6a3582431..0a6e5a7f80b7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Pure-PHP arbitrary precision integer arithmetic library
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Math_BigInteger http://phpseclib.sourceforge.net/documentation/math.html
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Math_BigInteger-1.0.3.tgz
-_md5_=391009f1024ce9ed8c6d609fd615cd3a
+_md5_=2bd663b731b7a302efd03648763f2279
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNS-1.0.7-r1 b/metadata/md5-cache/dev-php/PEAR-Net_DNS-1.0.7-r1
index e5a63736ab4a..2a3e7854c8be 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNS-1.0.7-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNS-1.0.7-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Resolver library used to communicate with a DNS server
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_DNS
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01 || ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_DNS-1.0.7.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=14e54c7cfe6d04b662d6bc69882eb757
+_md5_=7fcc196d4aa5342af679ff111109f7c8
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1 b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
index eb4ea5b4b881..524291e921ff 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
@@ -3,9 +3,9 @@ DESCRIPTION=PHP library to query DNS blacklists
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_DNSBL
 IUSE=examples
-KEYWORDS=~alpha amd64 hppa ~ia64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Cache_Lite dev-php/PEAR-HTTP_Request2 dev-php/PEAR-Net_DNS dev-php/PEAR-PEAR examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_DNSBL-1.3.7.tgz
-_md5_=ca72a8998851034723b8a756ac0e0457
+_md5_=f34c426c0871082dc1f79e087635cbbe
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1 b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
index 1fc00eaaf463..2a2c2b5e8dad 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OO interface for searching and manipulating LDAP-entries
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_LDAP2
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*[ldap] dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_LDAP2-2.2.0.tgz
-_md5_=002bfba5e6077cf2a1b8faec93a14940
+_md5_=305a9050ed607d3acd2414020b99f77a
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_POP3-1.3.8-r1 b/metadata/md5-cache/dev-php/PEAR-Net_POP3-1.3.8-r1
index 5811284d8b05..350d6dc6ae0e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_POP3-1.3.8-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_POP3-1.3.8-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Provides a POP3 class to access POP3 server
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_POP3
 IUSE=+sasl
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/PEAR-Net_Socket-1.0.6-r1 sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.2 ) >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_POP3-1.3.8.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=f2b3bee8ec717010f74d5b0fdcb57e15
+_md5_=8a4db500c7de9d0d4ceb41b7d5a1a05d
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
index 06abefa06f84..e8207f430892 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
@@ -3,9 +3,9 @@ DESCRIPTION=A PHP implementation of the SMTP protocol
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_SMTP
 IUSE=examples sasl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.2.tgz
-_md5_=77888c9e688cac7468998f1dc65c4357
+_md5_=79dfe0f034797b0c1b3813f81c555896
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
index 59217afdfb8d..366adf7a4a36 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=An API for talking to sieve (RFC 3028) servers
 EAPI=6
 HOMEPAGE=https://github.com/roundcube/Net_Sieve
 IUSE=sasl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.2.tar.gz -> PEAR-Net_Sieve-1.5.2.tar.gz
-_md5_=6a2547b759b0423b1d29c23855c73059
+_md5_=03647caeeb9507ab28805093a049221f
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
index ebcd6bc9e901..779b972c2b88 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
@@ -3,9 +3,9 @@ DESCRIPTION=PHP class to communicate with IRC networks
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_SmartIRC
 IUSE=doc examples
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/pear/Net_SmartIRC/archive/v1.1.10.tar.gz -> Net_SmartIRC-1.1.10.tar.gz
-_md5_=d9809f816d631239ff44fa2d3f76d407
+_md5_=03b3a59bd1bf74f7675ceaeab1460b9b
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2 b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
index 91ee6cfb141c..480ec94f4e7f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=PHP class interface to TCP sockets
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_Socket
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_Socket-1.2.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=15764ad5c5ed9ffd2a6e47e6447e0ec0
+_md5_=cd357cac168f4cc9994a061caf48f202
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_URL-1.0.15-r1 b/metadata/md5-cache/dev-php/PEAR-Net_URL-1.0.15-r1
index a9234d92ff5f..751e1719ff27 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_URL-1.0.15-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_URL-1.0.15-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Easy parsing of URLs
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_URL
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_URL-1.0.15.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=a27c143335d43f1d1185973715b66f80
+_md5_=dcc3cf759b3feca7bff21615bd67c213
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2 b/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
index 8bf3f802c416..281af0afb5cf 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_URL2
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_URL2-2.2.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=4272a88012c802e19e09c3af3e334e4b
+_md5_=974618a50dfaddcf4f75d96f00a4cd7a
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1
index 418c19ee3dc4..61835c54709e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Determines Web browser, version, and platform from an HTTP user agent string
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Net_UserAgent_Detect
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-2.02
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Net_UserAgent_Detect-2.5.2.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=223b765e19f7ac18a18485a51168d856
+_md5_=22b843ea31cb3b6b48eb0e29328e593b
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
index d939087765d2..edfce2e79601 100644
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Provides methods for spelling numerals in words
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Numbers_Words
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Math_BigInteger
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Numbers_Words-0.18.1.tgz
-_md5_=6e9483634a3b318889c3ee90cccaa8d3
+_md5_=9a5cf0bf0e441d3af6e79cd826e15a61
diff --git a/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3 b/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3
index 83b33d043b7a..e026a4a76376 100644
--- a/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3
+++ b/metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Package for reading and writing OLE containers
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/OLE
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/OLE-1.0.0RC3.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=9c34afc9abba4457195886eb3048d880
+_md5_=aab59f67eb971b674cfddbe58b3736b7
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
index 22a973206569..a6d4449a99c1 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
@@ -2,9 +2,9 @@ DEFINED_PHASES=config install postinst prepare prerm setup
 DESCRIPTION=PEAR Base System
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/PEAR
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR-1.10.6.tgz
-_md5_=c7cac1058200c337ed8493e3db2a25bf
+_md5_=dc6cf0750ff88cf0759754d209d3e74b
diff --git a/metadata/md5-cache/dev-php/PEAR-Pager-2.5.1 b/metadata/md5-cache/dev-php/PEAR-Pager-2.5.1
index 1f6da312cc60..0f778d509d6e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Pager-2.5.1
+++ b/metadata/md5-cache/dev-php/PEAR-Pager-2.5.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Data paging class
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Pager
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/php-5.6.0:* >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Pager-2.5.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=8a996323efb7b14921bce6876407c801
+_md5_=7d2998a8e533e551bc54a3daafc18605
diff --git a/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4 b/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
index bdf878fa4813..6ecb51b6a9a0 100644
--- a/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
+++ b/metadata/md5-cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Package for generating Excel spreadsheets
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Spreadsheet_Excel_Writer
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/php-5.4:*[iconv] >=dev-php/PEAR-OLE-0.5-r1 >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/Spreadsheet_Excel_Writer-0.9.4.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=218665309b22d8a2b1504706e9b45ec1
+_md5_=823aadffa6fa08b73b72be957a063dfd
diff --git a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
index a564fc24aea9..b6b90ce904e1 100644
--- a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Graph datastructure manipulation library
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Structures_Graph
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=LGPL-2.1
 PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://pear.php.net/get/Structures_Graph-1.1.1.tgz
-_md5_=77c349d5b4850b6dff70225f4078d75e
+_md5_=d63846963ccd480c78365b83a3c60973
diff --git a/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1 b/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
index a068a0691696..92ed5d178f05 100644
--- a/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
+++ b/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
@@ -3,9 +3,9 @@ DESCRIPTION=PHP command-line execution interface
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/System_Command
 IUSE=examples
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/System_Command-1.0.8.tgz
-_md5_=90e31e66e5b1e9cb8b5200c729c83ee3
+_md5_=1e33c4eec4367c46a2e813f30081893c
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1 b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
index 2af21914adfb..8d1b98190113 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Creating passwords with PHP
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Text_Password
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Text_Password-1.2.1.tgz
-_md5_=702b180e2f7a77d570cb3ff160b4eab7
+_md5_=1ceab36bd84eeb79ff35a6e306e29ae7
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904 b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
index fb4ad3cef4f1..c528874889b5 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
@@ -4,11 +4,11 @@ DESCRIPTION=Abstracts parsing and rendering rules for Wiki markup in structured
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Text_Wiki
 IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pear/Text_Wiki/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> Text_Wiki-1.2.2_p20170904.tar.gz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=27bea048a186af2ce48a095885e5c9b0
+_md5_=b3913444ae3ac2766203f892bcbf1546
diff --git a/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1 b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
index 2b383e5807d5..e1b18a4d436e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Validate-0.8.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Validation class
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/Validate
 IUSE=minimal test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=!minimal? ( dev-php/PEAR-Date ) >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/Validate-0.8.5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=2d45350ed906bba94f204eb778df133b
+_md5_=f515c9efb84507ccc5de69de6576f793
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Parser-1.3.7-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Parser-1.3.7-r1
index df35f0937325..9005ea4b918f 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_Parser-1.3.7-r1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Parser-1.3.7-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm test
 DESCRIPTION=XML parsing class based on PHP's SAX parser
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/XML_Parser
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_Parser-1.3.7.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=7c15a56babb6d980419648f0df6b8dfc
+_md5_=ed5a200a955ca2dcfe54b25ecc7e3f75
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1 b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
index 10e820c21bb8..288082c186ba 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=PHP parser for RDF and RSS documents
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/XML_RSS
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-XML_Parser
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/XML_RSS-1.1.0a1.tgz
-_md5_=18d9dbd1f3ed756f4a432192e890a9b5
+_md5_=85c0bfb41ff58d19bfa66b1c58e2c267
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1 b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
index e13e9c4e7e94..0e51eea46a15 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Serializer-0.21.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Swiss-army knife for reading and writing XML files
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/XML_Serializer
 IUSE=examples test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/php:*[xml] >=dev-php/PEAR-XML_Parser-1.2.7 >=dev-php/PEAR-XML_Util-1.1.1-r1 >=dev-php/pear-1.8.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_Serializer-0.21.0.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=fd562e011a284a5e46d556fe0f4c4649
+_md5_=24d9412060d44fa1cd0ac35c0c4e8413
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.2 b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.2
index 9f62c484099d..cde98bc255d2 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.2
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.2
@@ -3,10 +3,10 @@ DESCRIPTION=XML utility class
 EAPI=6
 HOMEPAGE=https://pear.php.net/package/XML_Util
 IUSE=examples
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*[pcre(+)]
 SLOT=0
 SRC_URI=https://pear.php.net/get/XML_Util-1.4.2.tgz
-_md5_=7207885e88815bc2bd1ce741f2ec0b7d
+_md5_=ea7bb973f735099f2883c6b582e4cd15
diff --git a/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2 b/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
index 67bade70b713..ccc076342abb 100644
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
+++ b/metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Collection, processing, and rendering for PHP code coverage
 EAPI=7
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.3 <dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2 <dev-php/Text_Template-2.0 >=dev-php/PHP_TokenStream-1.4 <dev-php/PHP_TokenStream-3.0 >=dev-php/sebastian-environment-1.3.2 <dev-php/sebastian-environment-3.0 >=dev-php/sebastian-version-1.0 <dev-php/sebastian-version-3.0 dev-php/sebastian-code-unit-reverse-lookup <dev-php/sebastian-code-unit-reverse-lookup-2.0 || ( dev-lang/php:7.2[xml(-),xmlwriter(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-code-coverage/archive/4.0.7.tar.gz -> PHP_CodeCoverage-4.0.7.tar.gz
-_md5_=0c348be8ea0c51c5563ec3f8f06f30ed
+_md5_=3c1c4bdc3e11db88a7f2b959dc45dd3d
diff --git a/metadata/md5-cache/dev-php/PHP_Timer-1.0.5 b/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
index d3a6beda3b30..c288a70c91d1 100644
--- a/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
+++ b/metadata/md5-cache/dev-php/PHP_Timer-1.0.5
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Utility class for timing
 EAPI=6
 HOMEPAGE=http://pear.phpunit.de/
-KEYWORDS=amd64 hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http:///get/PHP_Timer-1.0.5.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=dd605e96e2bd3255ebeb63e945765b78
+_md5_=6eb68880141e4308c76614a2529c65e6
diff --git a/metadata/md5-cache/dev-php/PHP_Timer-1.0.9 b/metadata/md5-cache/dev-php/PHP_Timer-1.0.9
index 20eeccfa05c5..95a27e29ff03 100644
--- a/metadata/md5-cache/dev-php/PHP_Timer-1.0.9
+++ b/metadata/md5-cache/dev-php/PHP_Timer-1.0.9
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Utility class for timing
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-timer/archive/1.0.9.tar.gz -> PHP_Timer-1.0.9.tar.gz
-_md5_=457e7c937b56181d05d381031f5f435a
+_md5_=e91af9059b068e7321106096dc3b297a
diff --git a/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1 b/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
index 445aeae54da9..8ffbd9d84a63 100644
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
+++ b/metadata/md5-cache/dev-php/PHP_TokenStream-1.4.11-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Wrapper around PHP's tokenizer extension
 EAPI=7
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader || ( dev-lang/php:7.2[tokenizer(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-token-stream/archive/1.4.11.tar.gz -> PHP_TokenStream-1.4.11.tar.gz
-_md5_=a539f5fc4fe9e182800cf8490b0a96c9
+_md5_=17a5b4a75d9bee9a310fd9945a3f9312
diff --git a/metadata/md5-cache/dev-php/Text_Template-1.1.1 b/metadata/md5-cache/dev-php/Text_Template-1.1.1
index 1e207bc00c85..5f304c3e14d5 100644
--- a/metadata/md5-cache/dev-php/Text_Template-1.1.1
+++ b/metadata/md5-cache/dev-php/Text_Template-1.1.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-php/pear-1.9.4
 DESCRIPTION=Simple template engine
 EAPI=6
 HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=amd64 hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http:///get/Text_Template-1.1.1.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=d85a605679182b93bb811a8b6c163282
+_md5_=5251673724c6a7d7b065499204a72b16
diff --git a/metadata/md5-cache/dev-php/Text_Template-1.2.1 b/metadata/md5-cache/dev-php/Text_Template-1.2.1
index 24576a488532..8e545373f3d0 100644
--- a/metadata/md5-cache/dev-php/Text_Template-1.2.1
+++ b/metadata/md5-cache/dev-php/Text_Template-1.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=A simple template engine
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/php-text-template/archive/1.2.1.tar.gz -> Text_Template-1.2.1.tar.gz
-_md5_=532d3e3c3f4b163e460d63958103f4b3
+_md5_=665338ec1a48b321225a1bc892f2fbfd
diff --git a/metadata/md5-cache/dev-php/YAML-1.0.6-r3 b/metadata/md5-cache/dev-php/YAML-1.0.6-r3
index 433991950944..1ad0668931b4 100644
--- a/metadata/md5-cache/dev-php/YAML-1.0.6-r3
+++ b/metadata/md5-cache/dev-php/YAML-1.0.6-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=The Symfony YAML Component
 EAPI=6
 HOMEPAGE=http://pear.symfony-project.com/
-KEYWORDS=amd64 hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=MIT
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.symfony-project.com/get/YAML-1.0.6.tgz
 _eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
-_md5_=ccefb3986461ac59b6b3af3186283868
+_md5_=8644f7d7f5fd8e63e9d62417b5b4c164
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.14 b/metadata/md5-cache/dev-php/adodb-5.20.14
index e555a6775fe9..28e2dde2bd1b 100644
--- a/metadata/md5-cache/dev-php/adodb-5.20.14
+++ b/metadata/md5-cache/dev-php/adodb-5.20.14
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Database abstraction layer for PHP
 EAPI=7
 HOMEPAGE=https://github.com/ADOdb
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD LGPL-2.1+
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.14.tar.gz -> adodb-5.20.14.tar.gz
-_md5_=542d77d33a2592b295b9855a6e204770
+_md5_=9b845137f2d8080c7bfb0c1be7aa1b31
diff --git a/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5 b/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
index 2f0841aa12a9..d972be7ee355 100644
--- a/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
+++ b/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
 EAPI=6
 HOMEPAGE=https://github.com/doctrine/instantiator
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/doctrine//instantiator/archive/1.0.5.tar.gz -> doctrine-instantiator-1.0.5.tar.gz
-_md5_=ff59f6f7ecc1d76b57774020b2cb2145
+_md5_=11e6ef3f703f3fa287c8dc78216da1e6
diff --git a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1 b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
index ce6407820510..8bb20d11dd68 100644
--- a/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
+++ b/metadata/md5-cache/dev-php/fedora-autoloader-0.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
 EAPI=6
 HOMEPAGE=https://github.com/php-fedora/autoloader
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/php-fedora/autoloader/archive/0.2.1.tar.gz -> fedora-autoloader-0.2.1.tar.gz
-_md5_=971b9795cf62af2953261d0cb0afa7b8
+_md5_=b74d6ba084139f380d89a9d9d01a284d
diff --git a/metadata/md5-cache/dev-php/jpgraph-4.0.2 b/metadata/md5-cache/dev-php/jpgraph-4.0.2
index 5e44e15e4c68..e70979186c92 100644
--- a/metadata/md5-cache/dev-php/jpgraph-4.0.2
+++ b/metadata/md5-cache/dev-php/jpgraph-4.0.2
@@ -3,9 +3,9 @@ DESCRIPTION=Object-oriented graphing library for PHP
 EAPI=6
 HOMEPAGE=http://jpgraph.net/
 IUSE=truetype examples
-KEYWORDS=~alpha amd64 hppa ppc sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
 LICENSE=QPL-1.0
 RDEPEND=truetype? ( media-fonts/corefonts ) dev-lang/php[gd,truetype?]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/jpgraph-4.0.2.tar.gz
-_md5_=397d738490342f058a5a014bee41f519
+_md5_=55164f8e23bdd222cfe33ceb43adb897
diff --git a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0 b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
index 26a2508a43f3..7c9f32924f13 100644
--- a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
+++ b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Create deep copies (clones) of your objects
 EAPI=6
 HOMEPAGE=https://github.com/myclabs/DeepCopy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.0.tar.gz -> myclabs-deepcopy-1.6.0.tar.gz
-_md5_=13a694514e6be3c7a84188cf35f1c420
+_md5_=3cb79870b9fdf6c255d45d001928dc8d
diff --git a/metadata/md5-cache/dev-php/pear-1.10.1-r1 b/metadata/md5-cache/dev-php/pear-1.10.1-r1
index 4869878ce864..8a41e4b130c1 100644
--- a/metadata/md5-cache/dev-php/pear-1.10.1-r1
+++ b/metadata/md5-cache/dev-php/pear-1.10.1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=PEAR - PHP Extension and Application Repository
 EAPI=6
 HOMEPAGE=https://pear.php.net/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-php/PEAR-PEAR-1.10.1-r1
 SLOT=0
-_md5_=bccec5f8b6fd6f089c6916406a6d86eb
+_md5_=48650a8baf5a2e4b104eb5a17a0a61b7
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
index bf49721542ac..79021a1f38b1 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.3
@@ -5,7 +5,7 @@ DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ tool
 EAPI=7
 HOMEPAGE=https://pecl.php.net/yaz
 IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
 REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.3.tgz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5ae185c8d36cf7804c84d4cfbb48938
+_md5_=74a2275081ceaaf857dcecae86b4578c
diff --git a/metadata/md5-cache/dev-php/phpdocumentor-reflection-common-1.0 b/metadata/md5-cache/dev-php/phpdocumentor-reflection-common-1.0
index bdf62abd87ab..3da77e042e82 100644
--- a/metadata/md5-cache/dev-php/phpdocumentor-reflection-common-1.0
+++ b/metadata/md5-cache/dev-php/phpdocumentor-reflection-common-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Common reflection classes used by phpdocumentor to reflect the code structure
 EAPI=6
 HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/phpDocumentor/ReflectionCommon/archive/1.0.tar.gz -> phpdocumentor-reflection-common-1.0.tar.gz
-_md5_=fe0f806c0b658d46994df385324ea0a7
+_md5_=59f4263a7484d66bf112ac3e653716a4
diff --git a/metadata/md5-cache/dev-php/phpdocumentor-reflection-docblock-3.1.1 b/metadata/md5-cache/dev-php/phpdocumentor-reflection-docblock-3.1.1
index 086c1b764454..e8ff18713f9d 100644
--- a/metadata/md5-cache/dev-php/phpdocumentor-reflection-docblock-3.1.1
+++ b/metadata/md5-cache/dev-php/phpdocumentor-reflection-docblock-3.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Provide support for annotations via DocBlocks
 EAPI=6
 HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader <dev-php/phpdocumentor-reflection-common-2 <dev-php/phpdocumentor-type-resolver-1 <dev-php/webmozart-assert-2 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/phpDocumentor/ReflectionDocBlock/archive/3.1.1.tar.gz -> phpdocumentor-reflection-docblock-3.1.1.tar.gz
-_md5_=5b8a93ae1af667554f45a42fa9f105fb
+_md5_=2aae26521c9378b0cb39b7b5ba052c3b
diff --git a/metadata/md5-cache/dev-php/phpdocumentor-type-resolver-0.2.1 b/metadata/md5-cache/dev-php/phpdocumentor-type-resolver-0.2.1
index e4e5e64cc18a..15a0866bc60a 100644
--- a/metadata/md5-cache/dev-php/phpdocumentor-type-resolver-0.2.1
+++ b/metadata/md5-cache/dev-php/phpdocumentor-type-resolver-0.2.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=PSR-5 based resolver of Class names, Types and Structural Element Names
 EAPI=6
 HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader <dev-php/phpdocumentor-reflection-common-2 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/phpDocumentor/TypeResolver/archive/0.2.1.tar.gz -> phpdocumentor-type-resolver-0.2.1.tar.gz
-_md5_=88cb6a74cfed078a1c88a26c958ed3b8
+_md5_=4fa704d710f5433d36b887a1afab938b
diff --git a/metadata/md5-cache/dev-php/phpspec-prophecy-1.7.0 b/metadata/md5-cache/dev-php/phpspec-prophecy-1.7.0
index 846b3cdcdf90..2b4916d774da 100644
--- a/metadata/md5-cache/dev-php/phpspec-prophecy-1.7.0
+++ b/metadata/md5-cache/dev-php/phpspec-prophecy-1.7.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Highly opinionated mocking framework
 EAPI=6
 HOMEPAGE=https://github.com/phpspec/prophecy
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader <dev-php/doctrine-instantiator-2 <dev-php/phpdocumentor-reflection-docblock-4 <dev-php/sebastian-comparator-3 <dev-php/sebastian-recursion-context-4 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/phpspec/prophecy/archive/v1.7.0.tar.gz -> phpspec-prophecy-1.7.0.tar.gz
-_md5_=da820263c8cdedd789c6c05ea243f355
+_md5_=287ad94d6892ef157472424e884cdb01
diff --git a/metadata/md5-cache/dev-php/phpunit-5.7.15-r3 b/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
index d48705c1bbe6..da6d816f7241 100644
--- a/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
+++ b/metadata/md5-cache/dev-php/phpunit-5.7.15-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=A PHP Unit Testing framework
 EAPI=7
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.4.0 <dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2.0 <dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-4.0.4 <dev-php/PHP_CodeCoverage-5.0 >=dev-php/PHP_Timer-1.0.6 <dev-php/PHP_Timer-2.0 <dev-php/myclabs-deepcopy-2.0 <dev-php/phpspec-prophecy-2.0 <dev-php/phpunit-mock-objects-4.0 <dev-php/sebastian-comparator-2.0 <dev-php/sebastian-diff-2.0 <dev-php/sebastian-environment-3.0 <dev-php/sebastian-exporter-3.0 <dev-php/sebastian-global-state-2.0 <dev-php/sebastian-object-enumerator-3.0 <dev-php/sebastian-resource-operations-2.0 <dev-php/sebastian-version-3.0 <dev-php/symfony-yaml-4.0 || ( dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-)] )
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/5.7.15.tar.gz -> phpunit-5.7.15.tar.gz
-_md5_=c1dbcb8954756b7a3678be526aef0aa6
+_md5_=864b2236a02561173f8f59d4b8e9f0a5
diff --git a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3 b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
index 1f1f7bd692c7..a24ea83c945c 100644
--- a/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
+++ b/metadata/md5-cache/dev-php/phpunit-mock-objects-3.4.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Mock Object library for PHPUnit
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 !>=dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=20b96e4c8bae0e80b0ab16fc4d8b822c
+_md5_=99dd411da98a5fb39420f1fa0989f247
diff --git a/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1 b/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
index f4d868b31515..8522202dbf0e 100644
--- a/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Looks up which function or method a line of code belongs to
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/code-unit-reverse-lookup/archive/1.0.1.tar.gz -> sebastian-code-unit-reverse-lookup-1.0.1.tar.gz
-_md5_=989e2c0084a1ea94f0c46bdc7e299986
+_md5_=b56c09933be3dad7a7d058ed434fd83f
diff --git a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4 b/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
index bbaa77008692..3ceb233d445f 100644
--- a/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
+++ b/metadata/md5-cache/dev-php/sebastian-comparator-1.2.4
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Compare PHP values for equality
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-diff-2.0 <dev-php/sebastian-exporter-3.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//comparator/archive/1.2.4.tar.gz -> sebastian-comparator-1.2.4.tar.gz
-_md5_=89ae91311774d665c45e4ca63e10f4d3
+_md5_=f7df87d562d05ec4a3d0b37eb44088eb
diff --git a/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1 b/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
index 65467ba8d350..c0a8180dda82 100644
--- a/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/sebastian-diff-1.4.1-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=PHP Diff implementation
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/diff/archive/1.4.1.tar.gz -> sebastian-diff-1.4.1.tar.gz
-_md5_=3f17c5539767cf3ca341b4d5d834378d
+_md5_=7d5a15a57d9864d338c41978b7c81ab8
diff --git a/metadata/md5-cache/dev-php/sebastian-environment-2.0.0 b/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
index e95c8182da40..cea57c931933 100644
--- a/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-environment-2.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Helps writing PHP code that has runtime-specific execution paths
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//environment/archive/2.0.0.tar.gz -> sebastian-environment-2.0.0.tar.gz
-_md5_=841cb0751d0d4955061bbeb19e90acae
+_md5_=64bbcebc877e050acb6c2aa35adab980
diff --git a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0 b/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
index 2a068dc7da62..6cf2fd4dfab8 100644
--- a/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-exporter-2.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Export PHP variables for visualization
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-2* >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//exporter/archive/2.0.0.tar.gz -> sebastian-exporter-2.0.0.tar.gz
-_md5_=35cec15db714b11e6f869512db08c34d
+_md5_=8b1564d2b13dfff7ab05277ee49996dc
diff --git a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1 b/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
index 733c5a29436d..cf57fa193c69 100644
--- a/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
+++ b/metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Snapshotting of global state
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//global-state/archive/1.1.1.tar.gz -> sebastian-global-state-1.1.1.tar.gz
-_md5_=462ffe76b29da1370419a83fc0b94eaa
+_md5_=7b7cf7f28998f63c477f6a826ccb0fec
diff --git a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1 b/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
index 9f93b411bdd1..1fde0ef533c5 100644
--- a/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-object-enumerator-2.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-recursion-context-3.0 >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/2.0.1.tar.gz -> sebastian-object-enumerator-2.0.1.tar.gz
-_md5_=7bb3004acfaa85310e3d7baccbbd0b9c
+_md5_=f727ba578bd341f59fb774e3fdde4c23
diff --git a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0 b/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
index 7a6bab9ebeb0..b190f80327ee 100644
--- a/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-recursion-context-2.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Recursively process PHP variables
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/2.0.0.tar.gz -> sebastian-recursion-context-2.0.0.tar.gz
-_md5_=9fcc1a5bfc7cd2a7de075205c44bddae
+_md5_=5ee87fb4c1b7ad362010967cb350ca3a
diff --git a/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0 b/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
index 5e26738878a6..dbcd642d3657 100644
--- a/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
+++ b/metadata/md5-cache/dev-php/sebastian-resource-operations-1.0.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Provides a list of PHP built-in functions that operate on resources
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann//resource-operations/archive/1.0.0.tar.gz -> sebastian-resource-operations-1.0.0.tar.gz
-_md5_=8205e576163b43890b79592402c12c68
+_md5_=c19c64e12ec825ce4d7f9abd3d7c0560
diff --git a/metadata/md5-cache/dev-php/sebastian-version-2.0.1 b/metadata/md5-cache/dev-php/sebastian-version-2.0.1
index df966501ee4b..7e45dd4ee801 100644
--- a/metadata/md5-cache/dev-php/sebastian-version-2.0.1
+++ b/metadata/md5-cache/dev-php/sebastian-version-2.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Helps with managing the version number of Git-hosted PHP projects
 EAPI=6
 HOMEPAGE=https://phpunit.de
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/sebastianbergmann/version/archive/2.0.1.tar.gz -> sebastian-version-2.0.1.tar.gz
-_md5_=14f779b6da1c5f74a2ca272d9d72d4e6
+_md5_=52455f33ae28555a11656c398b3943aa
diff --git a/metadata/md5-cache/dev-php/smarty-3.1.33 b/metadata/md5-cache/dev-php/smarty-3.1.33
index a784118f77e8..206c90f05104 100644
--- a/metadata/md5-cache/dev-php/smarty-3.1.33
+++ b/metadata/md5-cache/dev-php/smarty-3.1.33
@@ -4,9 +4,9 @@ DESCRIPTION=A template engine for PHP
 EAPI=7
 HOMEPAGE=https://www.smarty.net/
 IUSE=doc
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-lang/php:*[unicode]
 SLOT=0
 SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.33.tar.gz -> smarty-3.1.33.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=86af286d7ff89a361aabc122d7af904c
+_md5_=ff9873e13397224b9f99c27e0ed20394
diff --git a/metadata/md5-cache/dev-php/symfony-yaml-2.1.0 b/metadata/md5-cache/dev-php/symfony-yaml-2.1.0
index 03cafeead0d9..ff07d9713505 100644
--- a/metadata/md5-cache/dev-php/symfony-yaml-2.1.0
+++ b/metadata/md5-cache/dev-php/symfony-yaml-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Symfony YAML Component
 EAPI=6
 HOMEPAGE=https://github.com/symfony/yaml
 IUSE=test
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/symfony/yaml/archive/v2.1.0.tar.gz -> symfony-yaml-2.1.0.tar.gz
-_md5_=e24c4da0a3fbff0683ef28747379644e
+_md5_=a6c4654befe972b6474fe6094a24904c
diff --git a/metadata/md5-cache/dev-php/webmozart-assert-1.2.0 b/metadata/md5-cache/dev-php/webmozart-assert-1.2.0
index d4df3102d3a5..f2979123b27f 100644
--- a/metadata/md5-cache/dev-php/webmozart-assert-1.2.0
+++ b/metadata/md5-cache/dev-php/webmozart-assert-1.2.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Assertions to validate method input/output with nice error messages
 EAPI=6
 HOMEPAGE=https://github.com/webmozart/assert
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/webmozart//assert/archive/1.2.0.tar.gz -> webmozart-assert-1.2.0.tar.gz
-_md5_=ca2466f818992d1d3bc06328263170cf
+_md5_=15d1c813dda5ea89bd81d4e784dee842
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 099177b39edd..3ff5aa1a4e75 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/argparse-manpage-1.5 b/metadata/md5-cache/dev-python/argparse-manpage-1.5
new file mode 100644
index 000000000000..4d3350e63516
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argparse-manpage-1.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.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(-)] ) 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically build man-pages for your Python project
+EAPI=7
+HOMEPAGE=https://github.com/praiskup/argparse-manpage https://pypi.org/project/argparse-manpage/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/praiskup/argparse-manpage/archive/v1.5.tar.gz -> argparse-manpage-1.5.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e4302cc420228a8ae6da1f7dbdbcfca
diff --git a/metadata/md5-cache/dev-python/autobahn-20.12.2 b/metadata/md5-cache/dev-python/autobahn-20.12.2
new file mode 100644
index 000000000000..14fcdb8ff2a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autobahn-20.12.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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/pytest[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/pytest-asyncio[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/pynacl-1.0.1[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/pytrie-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(-)] >=dev-python/pyqrcode-1.1.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(-)] ) 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 postinst postrm prepare test
+DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
+EAPI=7
+HOMEPAGE=https://pypi.org/project/autobahn/ https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python
+IUSE=crypt scram test xbr python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/cbor-1.0.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/cbor2-5.1.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/cryptography-2.9.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/flatbuffers-1.10.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/lz4-0.7.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/msgpack-0.6.1[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/py-ubjson-0.8.4[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/snappy-0.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/twisted-20.3.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/txaio-20.4.1[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/ujson-2.0.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/wsaccel-0.6.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/zope-interface-3.6[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(-)] crypt? ( >=dev-python/pyopenssl-16.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/pynacl-1.0.1[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/pytrie-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(-)] >=dev-python/pyqrcode-1.1.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/service_identity-18.1.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(-)] ) scram? ( 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(-)] dev-python/argon2-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(-)] dev-python/passlib[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(-)] >=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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/autobahn/autobahn-20.12.2.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=69dee61f256a2e53ee627f379423788c
diff --git a/metadata/md5-cache/dev-python/boto3-1.16.36 b/metadata/md5-cache/dev-python/boto3-1.16.36
new file mode 100644
index 000000000000..5c8b44e324e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.16.36
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.19.36[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/jmespath-0.7.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/s3transfer-0.3.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/nose-1.3.7-r4[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.19.36[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/jmespath-0.7.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/s3transfer-0.3.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(-)] 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/boto/boto3/archive/1.16.36.tar.gz -> boto3-1.16.36.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/botocore-1.19.36 b/metadata/md5-cache/dev-python/botocore-1.19.36
new file mode 100644
index 000000000000..c8a7ac6c6de1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.19.36
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[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/jsonschema[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(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[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(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[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/jmespath[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/python-dateutil[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/urllib3-1.25.4[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/nose-1.3.7-r4[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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[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/jmespath[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/python-dateutil[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/urllib3-1.25.4[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(-)]
+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=mirror://pypi/b/botocore/botocore-1.19.36.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f5530f62319f8a88c8d1822506f374be
diff --git a/metadata/md5-cache/dev-python/dataclasses-0.8 b/metadata/md5-cache/dev-python/dataclasses-0.8
new file mode 100644
index 000000000000..08a16431e0d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dataclasses-0.8
@@ -0,0 +1,14 @@
+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
+DESCRIPTION=A backport of the dataclasses module for Python 3.6
+EAPI=7
+HOMEPAGE=https://pypi.org/project/dataclasses/ https://github.com/ericvsmith/dataclasses
+IUSE=python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=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 )
+SLOT=0
+SRC_URI=mirror://pypi/d/dataclasses/dataclasses-0.8.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1a57effe3aac17668aa3dcda4e692b98
diff --git a/metadata/md5-cache/dev-python/google-api-core-1.24.0 b/metadata/md5-cache/dev-python/google-api-core-1.24.0
new file mode 100644
index 000000000000..10baefdb94a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-core-1.24.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/grpcio[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/rsa[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-asyncio[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(-)] ) test? ( dev-python/namespace-google[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/protobuf-python[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/googleapis-common-protos[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/google-auth-1.21.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/requests-2.18.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/requests-3[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/six[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/pytz[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-4.5.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(-)] ) 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core Library for Google Client Libraries
+EAPI=7
+HOMEPAGE=https://github.com/googleapis/python-api-core https://googleapis.dev/python/google-api-core/latest
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[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/protobuf-python[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/googleapis-common-protos[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/google-auth-1.21.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/requests-2.18.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/requests-3[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/six[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/pytz[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/python-api-core/archive/v1.24.0.tar.gz -> google-api-core-1.24.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5b122ac343c8d33e6f246dd81da5b1cf
diff --git a/metadata/md5-cache/dev-python/google-auth-1.24.0 b/metadata/md5-cache/dev-python/google-auth-1.24.0
new file mode 100644
index 000000000000..87cd632069de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.24.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/namespace-google[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/pyasn1-0.1.7[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/pyasn1-modules-0.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/rsa-3.1.4[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/six-1.9.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/cachetools-2.0.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/pytest-4.5.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(-)] ) 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/namespace-google[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/pyasn1-0.1.7[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/pyasn1-modules-0.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/rsa-3.1.4[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/six-1.9.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/cachetools-2.0.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(-)] test? ( dev-python/cryptography[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/flask[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/freezegun[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/grpcio[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/mock[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/moto[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/oauth2client[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/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(-)] dev-python/pytest-localserver[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/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/responses[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/urllib3[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=Google Authentication Library
+EAPI=7
+HOMEPAGE=https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[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/pyasn1-0.1.7[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/pyasn1-modules-0.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/rsa-3.1.4[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/six-1.9.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/cachetools-2.0.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(-)] 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 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.24.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=10578c80ac99121e9b1e23dae5c8d580
diff --git a/metadata/md5-cache/dev-python/googleapis-common-protos-1.52.0 b/metadata/md5-cache/dev-python/googleapis-common-protos-1.52.0
new file mode 100644
index 000000000000..2d8aa22da647
--- /dev/null
+++ b/metadata/md5-cache/dev-python/googleapis-common-protos-1.52.0
@@ -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 ) 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=python classes generated from the common protos in the googleapis repository
+EAPI=7
+HOMEPAGE=https://pypi.org/project/googleapis-common-protos/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[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/protobuf-python[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/g/googleapis-common-protos/googleapis-common-protos-1.52.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4ce8292f1c4c62a6cfd4f16770c5de37
diff --git a/metadata/md5-cache/dev-python/joblib-1.0.0 b/metadata/md5-cache/dev-python/joblib-1.0.0
new file mode 100644
index 000000000000..71183a330551
--- /dev/null
+++ b/metadata/md5-cache/dev-python/joblib-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cloudpickle[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/loky[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(-)] test? ( dev-python/threadpoolctl[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(-)] ) test? ( dev-python/cloudpickle[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/loky[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-4.5.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(-)] ) 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools to provide lightweight pipelining in Python
+EAPI=7
+HOMEPAGE=https://joblib.readthedocs.io/en/latest/ https://github.com/joblib/joblib
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/cloudpickle[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/loky[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(-)]
+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/joblib/joblib/archive/1.0.0.tar.gz -> joblib-1.0.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dc5ea095114132fc815cf838fccf1ac8
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3-r1 b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
index 6331564ce06c..b0b2282d5e8e 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/piexif-1.1.3-r1
@@ -1,16 +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 ) 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(-)]
+BDEPEND=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(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] app-arch/unzip test? ( dev-python/pillow[jpeg,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(-)] )
+DEPEND=dev-python/setuptools[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(-)] app-arch/unzip test? ( dev-python/pillow[jpeg,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(-)] )
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=7
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15da5a7db74d5e6ba4ccec0c233a1eb6
+_md5_=9e78d6ac30375e47e72eb4817dedd2f9
diff --git a/metadata/md5-cache/dev-python/pillow-8.0.1 b/metadata/md5-cache/dev-python/pillow-8.0.1
index 0430bd0e7ccf..3a7e2bf77290 100644
--- a/metadata/md5-cache/dev-python/pillow-8.0.1
+++ b/metadata/md5-cache/dev-python/pillow-8.0.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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(-)] media-gfx/imagemagick[png] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=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(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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/pytest[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(-)] media-gfx/imagemagick[png] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=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(-)] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= )
 DESCRIPTION=Python Imaging Library (fork)
 EAPI=7
 HOMEPAGE=https://python-pillow.org/
-IUSE=examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+IUSE=examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=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=test? ( jpeg tiff ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[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=[tk?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?,threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[tk?,threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[tk?,threads(+)] ) >=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=test? ( jpeg tiff ) || ( python_targets_pypy3 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/python-pillow/Pillow/archive/8.0.1.tar.gz -> pillow-8.0.1.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f
-_md5_=51c2b50a935cc9004835021216645e0d
+_md5_=b9d8ba4f2bd611c07b617371a58e47c5
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.2.0 b/metadata/md5-cache/dev-python/pyenchant-3.2.0
new file mode 100644
index 000000000000..4e8c356d8f16
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyenchant-3.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-dicts/myspell-en ) test? ( app-text/enchant:* >=dev-python/pytest-4.5.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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for the Enchant spellchecking system
+EAPI=7
+HOMEPAGE=https://github.com/pyenchant/pyenchant https://pypi.org/project/pyenchant/
+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 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/enchant:* 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 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.2.0.tar.gz -> pyenchant-3.2.0.gh.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e5c1b86326698aab63e3a97282ec4fa
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.5.2 b/metadata/md5-cache/dev-python/slixmpp-1.5.2
index e754e36aaebc..11e88f676b32 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.5.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.5.2
@@ -1,16 +1,15 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-dns/libidn >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-dns/libidn
 DESCRIPTION=Python 3 library for XMPP
 EAPI=7
 HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
-IUSE=test python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-dns/libidn 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.5.2.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7f598c833503a3ee9378890ac3d4f78
+_md5_=c082307cba60c4cec6a2a27c780cee67
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index d6a4c6356443..87d66e31c28f 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-9999
@@ -1,15 +1,14 @@
-BDEPEND=test? ( dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-dns/libidn >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=net-dns/libidn
 DESCRIPTION=Python 3 library for XMPP
 EAPI=7
 HOMEPAGE=https://lab.louiz.org/poezio/slixmpp
-IUSE=test python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_7 python_targets_python3_8
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-python/aiodns[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] net-dns/libidn 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_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7f598c833503a3ee9378890ac3d4f78
+_md5_=c082307cba60c4cec6a2a27c780cee67
diff --git a/metadata/md5-cache/dev-python/stomp-py-6.1.0 b/metadata/md5-cache/dev-python/stomp-py-6.1.0
new file mode 100644
index 000000000000..5eeea34d1f0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/stomp-py-6.1.0
@@ -0,0 +1,15 @@
+BDEPEND=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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyproject2setuppy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client library for the STOMP messaging protocol
+EAPI=7
+HOMEPAGE=https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/
+IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/docopt-0.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/s/stomp.py/stomp.py-6.1.0.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cd2fe2f494d5b03bd0b7c44ca77179e6
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b45a6206585f..7b9f24a3d47c 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/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 5496839f46e4..589f85a22574 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -4,7 +4,7 @@ DESCRIPTION=A modern, pretty RDoc template
 EAPI=5
 HOMEPAGE=https://fauna.github.com/fauna/allison/files/README.html
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris
 LICENSE=AFL-3.0
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/allison-2.0.3.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=666baf05593fda173de93b54fbbe7bf3
+_md5_=4f5e11e9325caa91591b8fc5b7014530
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
index 80b52d6dd0a7..f445b4c34bf7 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.8
@@ -4,7 +4,7 @@ DESCRIPTION=Provides POSIX tarchive management from Ruby programs
 EAPI=6
 HOMEPAGE=https://github.com/halostatue/minitar
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD-2 Ruby )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> archive-tar-minitar-0.8.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c8d162d91f4ede244be754e1353d7fe
+_md5_=95045880d744cedf006e5ee68eb916be
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.10
index 17f4d1102373..651eb95f90cf 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_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_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 )
@@ -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	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c347c622db7901f711445d5d9e91cb81
+_md5_=5f62175db29670c29eb9272c872d1dc8
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.4 b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
index b124cafbe8b1..a1bba489995a 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.4
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
 EAPI=5
 HOMEPAGE=https://github.com/pepijnve/asciimath
 IUSE=ruby_targets_ruby25 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.4.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc18488e087edc307fc2ebfd353354e9
+_md5_=673a6f096ba2542662669c01fcdc0126
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index 10e36f7926c8..d722cb9e2dcf 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_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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e5711c748d6f56a59fec515c924a070d
+_md5_=b0bafd90840842d302187198832836dd
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.101 b/metadata/md5-cache/dev-ruby/atomic-1.1.101
index db0d2b974bb5..610cd5839202 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.101
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.101
@@ -4,7 +4,7 @@ DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
 EAPI=5
 HOMEPAGE=https://github.com/headius/ruby-atomic
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/atomic-1.1.101.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=04f682b0843d56771b7dc0470679511c
+_md5_=6caccc08197771c39b4bfa7783a9b79e
diff --git a/metadata/md5-cache/dev-ruby/backports-3.15.0 b/metadata/md5-cache/dev-ruby/backports-3.15.0
index 197ed05408c8..2eadecc3e3c9 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.15.0
+++ b/metadata/md5-cache/dev-ruby/backports-3.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=Backports of Ruby features for older Ruby
 EAPI=6
 HOMEPAGE=https://github.com/marcandre/backports
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/backports-3.15.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0dbcbdc6b5db2dd829b96aec8891f779
+_md5_=38539d1a696c9fa00d3ef547b4941f93
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index 289216648f15..d04b59f7ccfd 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Small RSpec clone weighing less than 350 LoC
 EAPI=5
 HOMEPAGE=http://chneukirchen.org/repos/bacon
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bacon-1.2.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9dee88d179b187903d0788c1edace66e
+_md5_=b4f6c79ed5956bf91e7401ba15726a10
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 0b8141f7a31f..50b02f814a83 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Base class with almost all of the methods from Object and Kernel bei
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/blankslate
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5fb332c1600da7e1b6adfb3bdf82a825
+_md5_=eed2b20ba98f753e1287ded6d8717aca
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
index fb0bcc727df8..b687ef26cdb0 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A binary search library for Ruby
 EAPI=5
 HOMEPAGE=http://0xcc.net/ruby-bsearch/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/bsearch-1.5.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3759675da1825422b7e08f49e580f784
+_md5_=6da374db336f5e5492e2553b1683f980
diff --git a/metadata/md5-cache/dev-ruby/childprocess-3.0.0 b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
index 57262e3e4a8c..c207f3a985ea 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-3.0.0
+++ b/metadata/md5-cache/dev-ruby/childprocess-3.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Solution for controlling external programs running in the background
 EAPI=7
 HOMEPAGE=https://github.com/jarib/childprocess
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/childprocess-3.0.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1464306d3acba90a23b84ae209ea066
+_md5_=fdc7a7b886a848434d8df394f20c626a
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 047ae5b7a44d..3901e525fab3 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -4,7 +4,7 @@ DESCRIPTION=Chronic is a natural language date/time parser written in pure Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mojombo/chronic
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2292760890cecdbf5806e1e2ff061510
+_md5_=d0196963f4a6172a0dfb02b58172a44f
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.2 b/metadata/md5-cache/dev-ruby/coderay-1.1.2
index 3daeda120adc..34a5cb21fa0c 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Ruby library for syntax highlighting
 EAPI=6
 HOMEPAGE=http://coderay.rubychan.de/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.2.tar.gz -> coderay-1.1.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4b61633a5b024e284892dbc94f39a096
+_md5_=c739c4c01350cbadf224455585d1121c
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
index a94f2fee4356..afa0f1bcd687 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.5
@@ -4,7 +4,7 @@ DESCRIPTION=Modern concurrency tools including agents, futures, promises, thread
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/concurrent-ruby
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.5.tar.gz -> concurrent-ruby-1.0.5.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b5b90c6461cc8a43c215ddeb94c8d1af
+_md5_=c04ed4c740fe29310624f47544f2908b
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.3.1 b/metadata/md5-cache/dev-ruby/daemons-1.3.1
index 33591cf0d066..e87b81a1b177 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.3.1
+++ b/metadata/md5-cache/dev-ruby/daemons-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=Wrap existing ruby scripts to be run as a daemon
 EAPI=6
 HOMEPAGE=https://github.com/thuehlinger/daemons
 IUSE=examples ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/thuehlinger/daemons/archive/v1.3.1.tar.gz -> daemons-1.3.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0a4e7b54ba02d508f7b5723e50a7bcb1
+_md5_=b872e09a141745216f5895957ae1117d
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
index 0c88c30c0a37..2c24c4d3f983 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A simple set of utility functions for Hash
 EAPI=6
 HOMEPAGE=http://trac.misuse.org/science/wiki/DeepMerge
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/deep_merge-1.2.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=77b1a192c885c4add7b75648e1d8b809
+_md5_=058fd71f7caa8fa73fefa5c65fca0c1e
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.3 b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
index d2d50f721161..c88663dff108 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.3
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Use the McIlroy-Hunt LCS algorithm to compute differences
 EAPI=5
 HOMEPAGE=https://github.com/halostatue/diff-lcs
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MIT Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/diff-lcs-1.3.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb575266644ca70291104f7e50b70da3
+_md5_=97b26b9974d4bd3936889839965666b8
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417 b/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
index 74368952a296..ad8a1b360683 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.20180417
@@ -4,7 +4,7 @@ DESCRIPTION=Domain Name manipulation library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-domain_name
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/unf-0.0.5-r1: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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/domain_name-0.5.20180417.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b692911214ee7ee004355a399436032
+_md5_=dec19594aa85bbea340f5a96dff8c53b
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index b137c07fd6bc..b2a9cd5946a1 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=fast_xs text escaping library ruby bindings
 EAPI=5
 HOMEPAGE=https://github.com/brianmario/fast_xs
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fast_xs-0.8.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9796979f4f585e42a7ab57b3108f3aa3
+_md5_=582cb97f23ceac9adc6d42704470325a
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index c7828f5a857e..39217a952c51 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=FastCGI library for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/alphallc/ruby-fcgi-ng
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Ruby
 RDEPEND=dev-libs/fcgi ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fcgi-0.9.2.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09e33069ff6199232ad17eb53e6d64af
+_md5_=ffb0cd882adf16d842e10261a937778c
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.11.3 b/metadata/md5-cache/dev-ruby/ffi-1.11.3
index a83f77a216de..ef2f7f924c89 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.11.3
+++ b/metadata/md5-cache/dev-ruby/ffi-1.11.3
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
 EAPI=7
 HOMEPAGE=https://wiki.github.com/ffi/ffi
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-libs/libffi:0= 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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.11.3.tar.gz -> ffi-git-1.11.3.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0d1e7016d0964683f374b21823380a1f
+_md5_=3c678c064fabbe38c522bce5a7a84713
diff --git a/metadata/md5-cache/dev-ruby/gherkin-5.1.0 b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
index e192832cf7f6..64e7057183bd 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-5.1.0
+++ b/metadata/md5-cache/dev-ruby/gherkin-5.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Fast Gherkin lexer and parser
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://rubygems.org/gems/gherkin-5.1.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=407c7d9b59188e978bd6f5189e2a6c57
+_md5_=138cfaf993154c890a856df501956fa0
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.6.0 b/metadata/md5-cache/dev-ruby/hiera-3.6.0
index 0c69916d71b2..132a54342b5c 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.6.0
+++ b/metadata/md5-cache/dev-ruby/hiera-3.6.0
@@ -5,7 +5,7 @@ DESCRIPTION=A simple pluggable Hierarchical Database
 EAPI=7
 HOMEPAGE=https://docs.puppet.com/hiera/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/deep_merge[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hiera-3.6.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e6cdb5f3bd3c79d85432b68fb5ce05ab
+_md5_=f0fe4b59bee92a8ddf3fcc511d0a666a
diff --git a/metadata/md5-cache/dev-ruby/highline-2.0.3 b/metadata/md5-cache/dev-ruby/highline-2.0.3
index 04776988e65f..6c0e38b671ab 100644
--- a/metadata/md5-cache/dev-ruby/highline-2.0.3
+++ b/metadata/md5-cache/dev-ruby/highline-2.0.3
@@ -5,7 +5,7 @@ DESCRIPTION=Highline is a high-level command-line IO library for ruby
 EAPI=7
 HOMEPAGE=https://github.com/JEG2/highline
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-2 Ruby )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/JEG2/highline/archive/v2.0.3.tar.gz -> highline-2.0.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bedf957af5c415302cfd4e74c1221ee9
+_md5_=aab3703a887da88203d092692bdd6898
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.21.0 b/metadata/md5-cache/dev-ruby/hoe-3.21.0
index 00f641b6c102..ee7242c5420b 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.21.0
+++ b/metadata/md5-cache/dev-ruby/hoe-3.21.0
@@ -5,7 +5,7 @@ DESCRIPTION=Hoe extends rake to provide full project automation
 EAPI=7
 HOMEPAGE=https://www.zenspider.com/projects/hoe.html
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 ~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=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby25(-)] <dev-ruby/rake-15.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] <dev-ruby/rake-15.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] <dev-ruby/rake-15.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hoe-3.21.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f42f92a8e92031e91a0e0f8d7a88b552
+_md5_=03e44f429df62d15667977f577b9996e
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index 9dcc35da1aaf..2549bd608c46 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -4,7 +4,7 @@ DESCRIPTION=A fast and liberal HTML parser for Ruby
 EAPI=5
 HOMEPAGE=https://wiki.github.com/hpricot/hpricot
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/fast_xs[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/fast_xs[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/fast_xs[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=55a83975df3d4f2e8a422c45b2c3829c
+_md5_=2f897c9c89b6dc38d219ec6c95188176
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.7 b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
index ac1ea132c7ee..be9e39d7e1ad 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.7
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=Instantiate an arbitrary Ruby class
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/introspection
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/blankslate:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/blankslate:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/blankslate:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/instantiator-0.0.7.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a33aceee5352a6137229607f3a4ea6c1
+_md5_=5893e4596777f0180eb8edbbc7abdec6
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.4 b/metadata/md5-cache/dev-ruby/introspection-0.0.4
index 8c7356a9fa87..aa1417c07619 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.4
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Dynamic inspection of the hierarchy of method definitions on a Ruby
 EAPI=5
 HOMEPAGE=http://jamesmead.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/introspection-0.0.4.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab61f9daf7243f65d4dae3950bde7f5c
+_md5_=1bbb07db412dc492eca3725d862b852e
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.3 b/metadata/md5-cache/dev-ruby/locale-2.1.3
index 07da6ea9e7bb..904d88224838 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.3
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.3
@@ -5,7 +5,7 @@ DESCRIPTION=A pure ruby library which provides basic APIs for localization
 EAPI=7
 HOMEPAGE=https://github.com/ruby-gettext/locale
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-macos
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.3.tar.gz -> locale-2.1.3-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=42b4b606aa438550ef701b30b0c16f72
+_md5_=4a0528504e6b68e55618f74ca0313596
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index 322c404c7bb8..0f3de7499267 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A comprehensive and flexible logging library written in Ruby
 EAPI=5
 HOMEPAGE=http://log4r.sourceforge.net/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-3
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/log4r-1.1.10.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a090901ee4fb0f3ff87903f2d8ffad6
+_md5_=58d9f7a3db1e66454ee8d258896b8eb5
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index 35876f04bbe1..25c2d5b9df05 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=Adds a __metaclass__ method to all Ruby objects
 EAPI=5
 HOMEPAGE=https://github.com/floehopper/metaclass
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f9ca78eadac286e38fe2d339584a279
+_md5_=2ddbdfaa52df8cd034c44683018fa01b
diff --git a/metadata/md5-cache/dev-ruby/mime-types-2.99.2 b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
index e7c2b7b5d716..c655fcca23b1 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.99.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.99.2
@@ -4,7 +4,7 @@ DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/mime-types-2.99.2.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00417f6ab3cde6a903f5ee6130be0abc
+_md5_=fbbc0aeeadd8bc36e5df3a5388fc9a1e
diff --git a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1 b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
index 2590107a9675..98a066e907ce 100644
--- a/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-global_expectations-1.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Support minitest expectation methods for all objects
 EAPI=7
 HOMEPAGE=https://github.com/jeremyevans/minitest-global_expectations
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/minitest-global_expectations-1.0.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=168e7c9a46646cfe70c82c47675c4c17
+_md5_=191e4977c728e7af7f6aa9f5a167e684
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 80aeb3ffae77..2932b8750444 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -4,7 +4,7 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=5
 HOMEPAGE=http://gofreerange.com/mocha/docs/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/metaclass[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/metaclass[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/metaclass[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0.14
 SRC_URI=https://rubygems.org/gems/mocha-0.14.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43aba8d4825999c2eb57dead2f09b0ee
+_md5_=31bc212c2722cd7e80688025f8d4a21f
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.8.0 b/metadata/md5-cache/dev-ruby/mocha-1.8.0
index c03655b48bca..d5530841774f 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.8.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
 EAPI=6
 HOMEPAGE=https://mocha.jamesmead.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1.0
 SRC_URI=https://rubygems.org/gems/mocha-1.8.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9a58dbbf9e31d4327b67fc196ae978fe
+_md5_=fadd9cf1eaff44f3369ff8d85aa69f19
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.13.1 b/metadata/md5-cache/dev-ruby/multi_json-1.13.1
index 00f0e142bcbb..ba9050d30ba3 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.13.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.13.1
@@ -4,7 +4,7 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=6
 HOMEPAGE=https://github.com/intridea/multi_json
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 s390 sparc 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.13.1.tar.gz -> multi_json-1.13.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=20ccba8fd2dff7c8686cd54aa6e92d6e
+_md5_=beda23b3f3004a835ffec7b0a4f63229
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.14.1 b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
index 6fdfc95c46b1..df5e238d411a 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.14.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.14.1
@@ -5,7 +5,7 @@ DESCRIPTION=A gem to provide swappable JSON backends
 EAPI=7
 HOMEPAGE=https://github.com/intridea/multi_json
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~s390 sparc 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby25(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby26(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( || ( >=dev-ruby/json-1.4:*[ruby_targets_ruby27(-)] >=dev-ruby/yajl-ruby-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.14.1.tar.gz -> multi_json-1.14.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bd54ef32088fe394434c2c8a9c4484d9
+_md5_=099dd9c89f59715f8ac633267bd9c69f
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index 8af2250c4b1d..a62e5c96bfe7 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=A uniform interface for Ruby testing libraries
 EAPI=5
 HOMEPAGE=http://cukes.info/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/multi_test-0.1.2.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b03b6a32e80d6383fbb680862d7ab8d
+_md5_=3bc5950148a945b9cae6df14084aa80c
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.1.1 b/metadata/md5-cache/dev-ruby/mustache-1.1.1
index 093a626cd88e..35d6d90cf1ff 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.1.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
 EAPI=7
 HOMEPAGE=https://mustache.github.com/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/mustache-1.1.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e15d850789462b9a20c99cd90275edb2
+_md5_=872801396f96e99dbb0cdb05905e8f9f
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index b6575ffb872d..642c091ce7e2 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Extremely mynymal test framework
 EAPI=5
 HOMEPAGE=https://github.com/mynyml/nanotest
 IUSE=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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2ef045582a8b212976980586e3398de
+_md5_=cc1e21ce305800cdc10c822bddee28a5
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 25123e72326f..c774586cb124 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Numerical N-dimensional Array class
 EAPI=5
 HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm64 hppa ~mips ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc ~ppc64 x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=985a165bb7fd97b18203ba5508ed6ea9
+_md5_=b6d28b62e7a04a00069e34664af14109
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.10.10 b/metadata/md5-cache/dev-ruby/nokogiri-1.10.10
index a0e6a55af5eb..65e384857e51 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.10.10
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.10.10
@@ -5,7 +5,7 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=7
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.10:= >=dev-libs/libxslt-1.1.34 virtual/libiconv ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.10.10.tar.gz -> nokogiri-1.10.10-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f61a1616f2ce8ae81bc5f0cdee1e4fbb
+_md5_=19d70879d311bd0fb8ad478e2c6844cb
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.10.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
index 70eb86a17393..063476d14a9a 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.10.4
@@ -5,7 +5,7 @@ DESCRIPTION=Nokogiri is an HTML, XML, SAX, and Reader parser
 EAPI=7
 HOMEPAGE=https://www.nokogiri.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.9:= >=dev-libs/libxslt-1.1.33 virtual/libiconv ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.10.4.tar.gz -> nokogiri-1.10.4-git.tgz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=269d13136a5869d236bd33cb2e9b9599
+_md5_=689315e655b2e612922d7cbb32bf6c90
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
index 63f4890b55a3..4b9e66cc53c6 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=7
 HOMEPAGE=https://github.com/rcairo/pkg-config
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=50072a3a59ba66743b36b623dfb2ba4c
+_md5_=e0d9da3d651b6bf4a60aebbc0d034e3c
diff --git a/metadata/md5-cache/dev-ruby/rack-2.2.3 b/metadata/md5-cache/dev-ruby/rack-2.2.3
index 2ce3ff2af215..29d1e584d792 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.2.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.2.3
@@ -5,7 +5,7 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=7
 HOMEPAGE=https://rack.github.com/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0 !!<dev-ruby/rack-2.1.1-r1:2.1 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2.2
 SRC_URI=https://github.com/rack/rack/archive/2.2.3.tar.gz -> rack-2.2.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d73a02524e1a7c2b0546b356f011c6eb
+_md5_=8a27164dbadddf9db68524b71f292c70
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0 b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
index f90b2ee57b33..576506472c20 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-1.1.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide a standard and simplified way to build and package Ruby exte
 EAPI=7
 HOMEPAGE=https://github.com/luislavena/rake-compiler
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v1.1.0.tar.gz -> rake-compiler-1.1.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d30dd16c0d87aac64d3d0b8f6ad904fc
+_md5_=e7423fcb6831cf58f0b14947787a51ad
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0 b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
index 38520ad7d8df..309ee13e7540 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=A thorough inotify wrapper for Ruby using FFI
 EAPI=6
 HOMEPAGE=https://github.com/nex3/rb-inotify
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/ffi[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rb-inotify-0.10.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a324db455c362e6c2a4ff74e9c8ea814
+_md5_=e65aae381db4e0bd37b4026fb612e869
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1 b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
index 1c3c1e7ea020..efae3834fa50 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.2.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Implementation of John Gruber's Markdown
 EAPI=5
 HOMEPAGE=https://github.com/rtomayko/rdiscount
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdiscount-2.2.0.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8afdf5086769a80537e9abbe516accff
+_md5_=77d8eb8fa9f39d8c8a0ceab50a613b28
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1 b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
index 1862656742f0..84bcd65dff7d 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A module for using Textile in Ruby
 EAPI=6
 HOMEPAGE=http://redcloth.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/archive/v4.3.2.tar.gz -> RedCloth-4.3.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=df58105fa0acfb671ed934b1f7ea9691
+_md5_=ffdfb0d601a16c32188d5c4be98c839e
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.7 b/metadata/md5-cache/dev-ruby/rexical-1.0.7
index 6fbe4d411a25..8b71b999e248 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.7
@@ -5,7 +5,7 @@ DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=7
 HOMEPAGE=https://github.com/tenderlove/rexical/tree/master
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 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
 RDEPEND=!!app-admin/rex ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rexical-1.0.7.gem
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6725798d5739aad26ab0a33f2cdb4554
+_md5_=814617b02520e4e667ec221cc1efc814
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index a15269e26170..b6aa9f5172e3 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A double framework featuring a selection of double techniques and a
 EAPI=6
 HOMEPAGE=https://rr.github.io/rr
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=302ceb05e7205ff6b07a72953865dd36
+_md5_=9d2aa25e61712d40cee8d598d95ada5a
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
index f5098ba81bd8..7ff818459158 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=Ruby bindings for rrdtool
 EAPI=6
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=graph test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef5c3b26ee7d9126323e13acb29d470f
+_md5_=392408e82ed7e636bc908bd8363e401f
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 6ad982b493ff..72ba166ef6ad 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-expectations-2.99*[ruby_targets_ruby27(-)] =dev-ruby/rspec-mocks-2.99*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/rspec-2.99.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35ebb4d02100440d2ea163a1f0f11141
+_md5_=55fe7d765ad5a40932504e1c4ee559a4
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.8.0 b/metadata/md5-cache/dev-ruby/rspec-3.8.0
index 34e8c515ff73..003f69867add 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.8.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby25(-)] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby25(-)] =dev-ruby/rspec-mocks-3.8*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-core-3.8*[ruby_targets_ruby26(-)] =dev-ruby/rspec-expectations-3.8*[ruby_targets_ruby26(-)] =dev-ruby/rspec-mocks-3.8*[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/rspec-3.8.0.gem
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ee85c77898bd22b714e91f9a61c1a8b
+_md5_=8b776e6ec0124398d2400b655e48fa5b
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
index 11fd50ab5c83..3d9e80c503ad 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53dbe9661e1feee84e455a54c228d56c
+_md5_=947e44ec7c8a40c02b593fe2ccfd5c3b
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
index 8c19f67d38e4..e53c2c7222e1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25(-)] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby25(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26(-)] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby26(-)] highlight? ( >=dev-ruby/coderay-1.1.1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.8.2.tar.gz -> rspec-core-3.8.2-git.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f9699cb5071784bcf7b9d26f31d3ed42
+_md5_=94fb6034693ebfa2fe4006e4ffcceb02
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 545177532646..bf9d8ea400be 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0c0c91e6bc38462351d06bf565734377
+_md5_=ae1f8278c6e265bb72e4d3384bf43539
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
index 6586f9bf4e81..4f7ede9e21f9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.8.4
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby25(-)] =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] <dev-ruby/diff-lcs-2[ruby_targets_ruby26(-)] =dev-ruby/rspec-support-3.8*[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.8.4.tar.gz -> rspec-expectations-3.8.4-git.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=689f222e7a3c276ea37b0ab7c65067d4
+_md5_=47ed18cf5a1a815e277b0a1a172664c4
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
index ef9b4f5d146e..2f18e9f4edab 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-its
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 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_ruby25? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.0.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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/rspec-its-1.2.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e7c3774ec9f8631b08125de9ea9bedf4
+_md5_=6d93a103af9b09490d0fca86c56aaff7
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index dc467298583a..af4caa27b159 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=http://rspec.rubyforge.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d4e5873114391679790798bbd6c11b4a
+_md5_=64a49ed464a2c91b1a9e7a5d3fc316ac
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
index afd6c7b7b11b..707b80969c93 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby25(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/rspec-support-3.8*[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby26(-)] =dev-ruby/diff-lcs-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.8.1.tar.gz -> rspec-mocks-3.8.1-git.tgz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=23e9068d45fd73d2d0df425a53cb3c7b
+_md5_=bce9890a30077c90394afffc769a7d04
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2 b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
index 1672bd876382..c639dd255d67 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.8.2.tar.gz -> rspec-support-3.8.2-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7783e2a2913de40068044ab113908c04
+_md5_=3e752f580c9c85cb2a04f362531a4076
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index a3c8009c872c..13811ecffb4c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Ruby bindings for Augeas
 EAPI=5
 HOMEPAGE=http://augeas.net/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0d52a03a58fe84d2ae64979d40d06c8c
+_md5_=36472186a07a73ac9a89813176ce0ffa
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
index e7fd174788a6..69f15e25f24f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
@@ -4,7 +4,7 @@ DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext
 EAPI=6
 HOMEPAGE=https://ruby-gettext.github.io/
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=|| ( Ruby LGPL-3+ )
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby26(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby26(-)] ) sys-devel/gettext 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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.2.9.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f8caac4b252394db7df01f2b8fb6bcb
+_md5_=6d392da1ce6e44cca847ab8c2d3fe6bd
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
index df97db78a94e..25a091fca913 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.5
@@ -5,7 +5,7 @@ DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext
 EAPI=7
 HOMEPAGE=https://ruby-gettext.github.io/
 IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=|| ( Ruby LGPL-3+ )
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby26(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby27(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby27(-)] ) sys-devel/gettext ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/gettext-3.3.5.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e92e803ecd053d689413aabc075e7b69
+_md5_=6e72fd57dbce3c2ee1acee69e3faf5ac
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
index f887e425ab96..7dc8384f10fa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.20
@@ -4,7 +4,7 @@ DESCRIPTION=A Ruby interface to some LDAP libraries
 EAPI=6
 HOMEPAGE=https://github.com/bearded/ruby-ldap
 IUSE=ssl ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86 ~x86-macos
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86 ~x86-macos
 LICENSE=BSD
 RDEPEND=>=net-nds/openldap-2 dev-libs/cyrus-sasl ssl? ( dev-libs/openssl:0 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-ldap-0.9.20.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=82a5cb40fc009868e276ddf318d0fdb7
+_md5_=90f2039cbf78ad3a2b2543fa48d41179
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
index d9e808bada24..cec0adb5d0c6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL / GLUT bindings for ruby
 EAPI=6
 HOMEPAGE=https://github.com/larskanis/opengl
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=amd64 hppa ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/opengl-0.10.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=53ba4d395658fb07fc60a1617fa113dc
+_md5_=ad9bdbe19cbf0ef3a818fafa61c6c688
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 2baf1ea4bdf3..900fc56bc1de 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=ruby shadow bindings
 EAPI=5
 HOMEPAGE=https://github.com/apalmblad/ruby-shadow http://ttsky.net
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ruby-shadow-2.5.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2b191367a28c4954779cbbaf0c980a07
+_md5_=f83b2568807d4cdec12934c0b89c9cb5
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
index 8c9e3960d5e1..a83b217c03ad 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] !<dev-ruby/ruby2ruby-1.3.1-r1[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fab714ed25ae942b990dfb4a69488af3
+_md5_=3b9f20cf19b266c209dbdf0a6188d1de
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index 9d93a76af5ac..7e636cededa1 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -5,7 +5,7 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62a51f06beeeba28957a7e88cac78c4f
+_md5_=0871e4d19b83f91f4ad2a30bd26ee91f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.13.1 b/metadata/md5-cache/dev-ruby/ruby_parser-3.13.1
index 11018aba6317..6f64cd88a08e 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.13.1
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.13.1
@@ -4,7 +4,7 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=6
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25(-)] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] !<dev-ruby/ruby_parser-2.3.1-r1[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.13.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5477efeb61e28f4f5e0b6d62d14ef9ad
+_md5_=d8a7b3cc177e2f2b26265c7454f0c852
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
index 1cac4ad457d7..f8c50e7f3447 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
@@ -5,7 +5,7 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5b1a7aa5f3a56436e7736ba7f38cebb
+_md5_=fe8e510b324ece7b980dd4cfd79e36f6
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0 b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
index b2d25237e5af..52724ea2a26b 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=A ruby library for reading and writing zip files
 EAPI=7
 HOMEPAGE=https://github.com/rubyzip/rubyzip
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.3.0.tar.gz -> rubyzip-1.3.0-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f07f8a60f18a002924873a3c9202e7a4
+_md5_=ffe6e5b69938d10ebf990f070cc83ad1
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2 b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
index 854b36e3b285..dccbd9dbb5f8 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-1.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Library of tools for working with Semantic Versions and module depen
 EAPI=6
 HOMEPAGE=https://github.com/puppetlabs/semantic_puppet
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/semantic_puppet-1.0.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cde9ef0a56ed7627d48867a7a4ecb430
+_md5_=1ebde591c66693df6f697bd1b60bd609
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 75cc84da8380..e6a90ac5c796 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=A set of classes to drive external programs via pipe
 EAPI=5
 HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
 IUSE=test ruby_targets_ruby25 test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/session-3.2.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d75926a2f23e90356fc63a701f32fde
+_md5_=67edf9651130d891da28d5172555ad1b
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.12.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.12.0
index 201be27c0334..56528b6258ae 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.12.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=6
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.12.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=661a27e9d65a32e7e86662c77c4329c7
+_md5_=15ba41a2b366522d5c7a7e668d610b27
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
index e9c550f8a073..8a3f214d60b5 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
@@ -5,7 +5,7 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=7
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45cbaa2896561f089671ba567db5a50b
+_md5_=3089fe8dcc8c5224ff65c73db8fd9ae9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index ec1522d461ec..2f7892820bf5 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=649ea2a9caf7b8b3cec0d762a1498a82
+_md5_=8e292dab0fbaa85774832cacd38c2fdb
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.2 b/metadata/md5-cache/dev-ruby/syntax-1.2.2
index 9c79a29f9546..559058083955 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.2
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.2
@@ -4,7 +4,7 @@ DESCRIPTION=Syntax highlighting for sourcecode and HTML
 EAPI=6
 HOMEPAGE=https://github.com/dblock/syntax
 IUSE=test doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~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 ~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=BSD
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.2.tar.gz -> syntax-1.2.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3161833645afd571cfc00145d4972603
+_md5_=07d30534cbf6d59d7057ff65217c8f4d
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
index 6ec5431fd726..96b0cc7c07b8 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Small Ruby library that colors strings using ANSI escape sequences
 EAPI=6
 HOMEPAGE=https://flori.github.io/term-ansicolor/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 ~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 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/tins-1.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/tins-1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tins-1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/term-ansicolor-1.7.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1be1f3b96b4c89f2f9a6ec58ed16d254
+_md5_=1543fcff3a1350d7bc5b341b607b198b
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index ba36008b0b86..08cf096f5e72 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -4,7 +4,7 @@ DESCRIPTION=RR adapter for Test::Unit
 EAPI=5
 HOMEPAGE=https://github.com/test-unit/test-unit-rr
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby27(-)] >=dev-ruby/test-unit-2.5.2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/test-unit-rr-1.0.5.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c0fcee9cae6fde77b3fb0a2572794f60
+_md5_=0a9cc173596464f93efb0a641f426a2e
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index cfdd2d1f69ea..b7696b1e47ef 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of text algorithms
 EAPI=5
 HOMEPAGE=https://github.com/threedaymonk/text
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=28f20f8abfdefd40b25aa9e25e2a8451
+_md5_=c7cbc51c03ea83d851ad145de29e8f61
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index 665cea08f194..45f74ffcbfe8 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Hyphenates words according to the rules of the language the word is
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/text-format
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-hyphen-1.4.1.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0eb12caaa1d00e7c2b52c54a08e1b960
+_md5_=b16f505e4877ddc705cc64602e0036f0
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.1 b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
index 12d197b70fb4..29a41361d399 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.1
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Test helper for ordering threaded code
 EAPI=6
 HOMEPAGE=https://github.com/JoshCheek/thread_order
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa 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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_order-1.1.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cad173b766a23a87ed21c92374e49716
+_md5_=45ef3a615199bf27b6d19dccd79943d0
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
index 7c35c97e2e90..b8ddf628ad02 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of thread-safe versions of common core Ruby classes
 EAPI=5
 HOMEPAGE=https://github.com/ruby-concurrency/thread_safe
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/thread_safe-0.3.6.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fc5aebe92a1ba7f51742d83a63e56168
+_md5_=d5ded532ad31dd1966c7a8c7519e7c07
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.9.1 b/metadata/md5-cache/dev-ruby/timecop-0.9.1
index 3846b5b4dac1..012f8ab1ce9d 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.9.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.9.1
@@ -4,7 +4,7 @@ DESCRIPTION=A gem providing 'time travel' and 'time freezing' capabilities
 EAPI=6
 HOMEPAGE=https://github.com/travisjeffery/timecop
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/timecop-0.9.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c4fc2880022676a3c695644d9046374
+_md5_=a9c6c6e4b502d14bcd6ef8bf3da0ec5c
diff --git a/metadata/md5-cache/dev-ruby/tins-1.20.2 b/metadata/md5-cache/dev-ruby/tins-1.20.2
index 3b6dce8aeffd..49a9179a94f6 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.20.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.20.2
@@ -4,7 +4,7 @@ DESCRIPTION=All the stuff that isn't good enough for a real library
 EAPI=6
 HOMEPAGE=https://github.com/flori/tins
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tins-1.20.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bee803ec5b6d9c3986718a8d58f3e55a
+_md5_=99785ab8e5d447baa43887753070848f
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
index 62de951ed0cb..ce888791c74d 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
@@ -4,7 +4,7 @@ DESCRIPTION=Daylight-savings aware timezone library
 EAPI=6
 HOMEPAGE=https://tzinfo.github.io/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ~ppc64 x86 ~amd64-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/timezone-data ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/thread_safe-0.1: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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/tzinfo-1.2.5.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4117cf7296f96fa39e8150575b17f795
+_md5_=77b073d4a860edf612213d49cdbd338d
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index c46f095aa714..bd16ed9e1d04 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=A wrapper library to bring Unicode Normalization Form support to Rub
 EAPI=5
 HOMEPAGE=https://github.com/knu/ruby-unf
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/unf_ext[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/unf_ext[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf-0.1.4.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d1d2a722bd72be1f7c6d10f32f812134
+_md5_=0660ce981a51248fbe5de81aefdad4e4
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
index 6228c5bb034d..1a28f3d9a249 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.5
@@ -4,7 +4,7 @@ DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=6
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
 IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.7.5.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9dbaba8ecebfdda4e07820339cc927ca
+_md5_=456b2d14d838615d26896dc17168e016
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index c5f1b97be360..cf13b49207db 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Ruby method to unindent strings
 EAPI=5
 HOMEPAGE=https://github.com/mynyml/unindent
 IUSE=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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unindent-1.0.gem
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f10bace7eddbd1116dee076586643fb1
+_md5_=b4f137c7a3b826aa6ce7781ee97cba68
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
index 31de6a8b4872..b49fe2aa8924 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/yajl ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e64f0433c39801a5a65f18c7b2cf232
+_md5_=4f7aa8b4dd1715a0e68d0ab61bb15e67
diff --git a/metadata/md5-cache/dev-ruby/yard-0.9.20 b/metadata/md5-cache/dev-ruby/yard-0.9.20
index 64e27afa84c0..238d97e4c97d 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.9.20
+++ b/metadata/md5-cache/dev-ruby/yard-0.9.20
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation generation tool for the Ruby programming language
 EAPI=6
 HOMEPAGE=https://yardoc.org/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.9.20.tar.gz -> yard-0.9.20-git.tgz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c29711486d462f732a634cff121f00b0
+_md5_=a3f08f28ddb0953472fc8ee91ec9375b
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.12.0 b/metadata/md5-cache/dev-ruby/zentest-4.12.0
index e2915f0bcacd..de78b7f9b223 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.12.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Ra
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/zentest
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/ZenTest-4.12.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bd5c686a09a78f4b94d52e2bf1b6fd68
+_md5_=cc0f00e19b9ac1539578349911cd694b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3fcebccaa711..7697c2428547 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/aruba-0.6.2-r2 b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
index 31bfe3021f66..78749e17ca02 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2-r2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby25(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby26(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-2.7:2[ruby_targets_ruby27(-)] >=dev-util/cucumber-1.1.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/aruba-0.6.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2c961241a41c9f4cfceb1c9d1c37df48
+_md5_=64b795dd9ced98b0bdb0d77c42433e59
diff --git a/metadata/md5-cache/dev-util/cucumber-3.1.2 b/metadata/md5-cache/dev-util/cucumber-3.1.2
index 0bba770e32a0..7e76e11dc8d2 100644
--- a/metadata/md5-cache/dev-util/cucumber-3.1.2
+++ b/metadata/md5-cache/dev-util/cucumber-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=examples test test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby25(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby25(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby25(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby25(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby25(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby25(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby26(-)] dev-util/cucumber-core:3.2[ruby_targets_ruby26(-)] >=dev-util/cucumber-expressions-6.0.1:6.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-wire-0.0.1:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] >=dev-ruby/gherkin-5.1.0:5[ruby_targets_ruby26(-)] >=dev-ruby/multi_json-1.7.5[ruby_targets_ruby26(-)] >=dev-ruby/multi_test-0.1.2[ruby_targets_ruby26(-)] ) ruby_targets_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cucumber/cucumber-ruby/archive/v3.1.2.tar.gz -> cucumber-3.1.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c5c86a2b35da38f2e11ae29ba4317ead
+_md5_=8a33e2ab3e350a96579e8795ed4941ef
diff --git a/metadata/md5-cache/dev-util/cucumber-core-3.2.1 b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
index abcf8206884c..b174fdfcc022 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-3.2.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-3.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby25(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby25(-)] dev-ruby/gherkin:5[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby26(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby26(-)] dev-ruby/gherkin:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/backports-3.8.0[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag_expressions-1.1.0[ruby_targets_ruby27(-)] dev-ruby/gherkin:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.2
 SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v3.2.1.tar.gz -> cucumber-core-3.2.1.tar.gz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4381ae2ac6865585b08a4b67fb87d467
+_md5_=a6edbf9632a28810a8e5f2a825b2779c
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1 b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
index b0e524f576f7..051ebea48fc0 100644
--- a/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-6.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=a simpler alternative to Regular Expressions
 EAPI=6
 HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://rubygems.org/gems/cucumber-expressions-6.0.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=347eccb8869777109edba8529101946a
+_md5_=67b766012adc95ac18cac48504c3b2c4
diff --git a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1 b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
index 84d444759df4..83e6c3a68e43 100644
--- a/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
+++ b/metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Cucumber tag expressions for ruby
 EAPI=6
 HOMEPAGE=https://docs.cucumber.io/tag-expressions/
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/cucumber-tag_expressions-1.1.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48a0ab6027d82b8cb09e259faf5878f0
+_md5_=7858ce67972a53f440b7b5ccc496a73a
diff --git a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1 b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
index 7d7a777cc456..218ad9671c03 100644
--- a/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
+++ b/metadata/md5-cache/dev-util/cucumber-wire-0.0.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Executable feature scenarios
 EAPI=6
 HOMEPAGE=https://github.com/aslakhellesoy/cucumber/wikis
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cucumber-wire-0.0.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb19f698ead7b626c81f08a0fcf24f49
+_md5_=1c3270c2937c44a7af1c6511ec71713e
diff --git a/metadata/md5-cache/dev-util/edb-debugger-1.3.0 b/metadata/md5-cache/dev-util/edb-debugger-1.3.0
new file mode 100644
index 000000000000..6f6985d74548
--- /dev/null
+++ b/metadata/md5-cache/dev-util/edb-debugger-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost virtual/pkgconfig dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
+DESCRIPTION=edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
+EAPI=7
+HOMEPAGE=https://github.com/eteran/edb-debugger
+IUSE=graphviz
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
+SLOT=0
+SRC_URI=https://github.com/eteran/edb-debugger/releases/download/1.3.0/edb-debugger-1.3.0.tgz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae5f56ec8943d8c56e390a4c0beda5d7
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6-r1 b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
index 1e4237fa8461..6db6c6d802c9 100644
--- a/metadata/md5-cache/dev-util/itstool-2.0.6-r1
+++ b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=setup test
-DEPEND=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-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] )
+DEPEND=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_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] )
 DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS rules
 EAPI=7
 HOMEPAGE=http://itstool.org/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3+
-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-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+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_9? ( dev-lang/python:3.9[xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/libxml2[python,python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6aa736c06ce614a1fffef98a80a3f138
+_md5_=14b09f9ef3665e26234843f9e1840121
diff --git a/metadata/md5-cache/dev-util/strace-5.10 b/metadata/md5-cache/dev-util/strace-5.10
new file mode 100644
index 000000000000..ccc1f52d5fcf
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.10
@@ -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=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.10/strace-5.10.tar.xz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1c6605f74ee7a8957e56ebd01aaf43d1
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 27c39cad2035..a499beb53f80 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/gdm-3.36.3 b/metadata/md5-cache/gnome-base/gdm-3.36.3
index 8400448850e0..00cf604712cd 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.36.3
+++ b/metadata/md5-cache/gnome-base/gdm-3.36.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.36/gdm-3.36.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14d3ba62ba37105b1933b6aa137dc3b6
+_md5_=40c432e212f151bc5eec84bb928b12e9
diff --git a/metadata/md5-cache/gnome-base/gdm-3.36.4 b/metadata/md5-cache/gnome-base/gdm-3.36.4
index 5db42b68a190..2cf4b66407da 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.36.4
+++ b/metadata/md5-cache/gnome-base/gdm-3.36.4
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.36/gdm-3.36.4.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f504567b5fe749747ba54ea3b01a659
+_md5_=6b95f18b5419a071b5073dd3623a09a5
diff --git a/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4 b/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
index 77e52d48812b..d86d516e29b6 100644
--- a/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
+++ b/metadata/md5-cache/gnome-base/gnome-flashback-3.36.4
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-flashback/3.36/gnome-flashback-3.36.4.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57aaac9ec12c0cf60694eb2507c4c31f
+_md5_=5152969fd27c39d41e460c945ce95128
diff --git a/metadata/md5-cache/gnome-base/gnome-panel-3.36.2 b/metadata/md5-cache/gnome-base/gnome-panel-3.36.2
index 1bb9832b7ceb..b512a24da28e 100644
--- a/metadata/md5-cache/gnome-base/gnome-panel-3.36.2
+++ b/metadata/md5-cache/gnome-base/gnome-panel-3.36.2
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-panel/3.36/gnome-panel-3.36.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3eecd8fe24374c0c69cc582efce508ad
+_md5_=631ae52dd7e45e261edeefb259fc95bd
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index be7c13c61059..3f09692a1693 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158 b/metadata/md5-cache/mail-filter/dcc-1.3.158
index ce9883c39af4..6e10f2127de6 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.158
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=5
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=DCC GPL-2
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.158.tar.Z
 _eclasses_=base	a3f380d8a13f148f16d76fe39e90f451	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0cf5d269742c44bc1edb23f1c22be582
+_md5_=2cf62712b7787c1f95388223cdea3385
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 89f95086dbab..afa4764146c2 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20201104 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20201212
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.6_pre20201104
rename to metadata/md5-cache/mail-mta/postfix-3.6_pre20201212
index 9df9f71917e2..0e6f3fabf363 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.6_pre20201104
+++ b/metadata/md5-cache/mail-mta/postfix-3.6_pre20201212
@@ -10,6 +10,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl ) !libressl
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20201104.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20201212.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	pam	226d8d2ff588bdfd7d188512dbdb189d	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=01efefcb23e1b28547b525be877b29c0
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 0a3c8e3ff663..b139e73e76d6 100644
Binary files a/metadata/md5-cache/mate-extra/Manifest.gz and b/metadata/md5-cache/mate-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.0 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.0
index 63f78943a650..0eabdffa928a 100644
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.0
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.0
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-system-monitor-1.24.0.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5129692daf257ab6135ab566bb7d0e0
+_md5_=979fd9fe386f771c5bed0d7857fe0707
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
index a9bacb90ffcc..82965431f02d 100644
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-system-monitor-1.24.1.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dda748eba9be6edbea715c01ae033643
+_md5_=1dd983e83b6968553cb3473786d41089
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 495cea9e3ecd..ee7371ec05ad 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-1909.16 b/metadata/md5-cache/media-fonts/cascadia-code-1909.16
deleted file mode 100644
index f9f9eb758e31..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-1909.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospaced font developed for Windows Terminal
-EAPI=6
-HOMEPAGE=https://github.com/microsoft/cascadia-code
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/microsoft/cascadia-code/archive/v1909.16.tar.gz -> cascadia-code-1909.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3e68b7ccfedaa6883665015b798aaa8
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-1910.04 b/metadata/md5-cache/media-fonts/cascadia-code-1910.04
deleted file mode 100644
index 5558a02196f9..000000000000
--- a/metadata/md5-cache/media-fonts/cascadia-code-1910.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=A monospaced font developed for Windows Terminal
-EAPI=6
-HOMEPAGE=https://github.com/microsoft/cascadia-code
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/microsoft/cascadia-code/archive/v1910.04.tar.gz -> cascadia-code-1910.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e6e9518816e7d50f18784e1ce48d659
diff --git a/metadata/md5-cache/media-fonts/cascadia-code-2004.30 b/metadata/md5-cache/media-fonts/cascadia-code-2009.22
similarity index 82%
rename from metadata/md5-cache/media-fonts/cascadia-code-2004.30
rename to metadata/md5-cache/media-fonts/cascadia-code-2009.22
index da347dd1a0dd..5473a1ddec87 100644
--- a/metadata/md5-cache/media-fonts/cascadia-code-2004.30
+++ b/metadata/md5-cache/media-fonts/cascadia-code-2009.22
@@ -8,6 +8,6 @@ IUSE=X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2004.30/CascadiaCode_2004.30.zip -> cascadia-code-2004.30.zip
+SRC_URI=https://github.com/microsoft/cascadia-code/releases/download/v2009.22/CascadiaCode-2009.22.zip -> cascadia-code-2009.22.zip
 _eclasses_=font	dd073b36fe3fd8b868c23bc23209db45
-_md5_=b8783959b8d729e39d7ff785ff35cf38
+_md5_=30e38b6b3aa72b84fada6b1baf6f1f51
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 667285eebae6..2024ee9fa7f1 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/imageworsener-1.3.2 b/metadata/md5-cache/media-gfx/imageworsener-1.3.2
deleted file mode 100644
index d1f908900f41..000000000000
--- a/metadata/md5-cache/media-gfx/imageworsener-1.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Utility for image scaling and processing
-EAPI=6
-HOMEPAGE=http://entropymine.com/imageworsener/
-IUSE=jpeg png static-libs test webp zlib
-KEYWORDS=amd64 x86
-LICENSE=MIT-with-advertising
-RDEPEND=png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg:0 ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=test? ( jpeg png webp zlib )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://entropymine.com/imageworsener/imageworsener-1.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d14dfb8c8b5dfc03c56b5a7e4e9dfc11
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 85453815bcde..edc4c61d218b 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/pulseaudio-13.0 b/metadata/md5-cache/media-sound/pulseaudio-13.0
index 9b6b67954f09..f73a189dc9f2 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=275a5df55b9422b9197f8cf964e1d3e2
+_md5_=1a2b1aeef7e6e85858f3fd2a8025ac35
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
index 65d442749342..886f45236f6f 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b8dd7601a30acfec85f6cd3682c3e1a
+_md5_=9821d8910e1f1f9b5150568d4e0c5ae7
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8384bee6adfc..187e977ba269 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/makemkv-1.15.3 b/metadata/md5-cache/media-video/makemkv-1.15.4
similarity index 89%
rename from metadata/md5-cache/media-video/makemkv-1.15.3
rename to metadata/md5-cache/media-video/makemkv-1.15.4
index a734ed711cec..f6eaf9c4ed95 100644
--- a/metadata/md5-cache/media-video/makemkv-1.15.3
+++ b/metadata/md5-cache/media-video/makemkv-1.15.4
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
 RDEPEND=sys-libs/glibc dev-libs/expat sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) >=media-video/ffmpeg-1.0.0:0= !libressl? ( dev-libs/openssl:0=[-bindist(-)] ) libressl? ( dev-libs/libressl:0= ) media-video/ccextractor net-misc/wget
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.15.3.tar.gz http://www.makemkv.com/download/makemkv-bin-1.15.3.tar.gz
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.15.4.tar.gz http://www.makemkv.com/download/makemkv-bin-1.15.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6df2086c10fcfbf29359401c5eca1ab8
+_md5_=786ffb12d39439e13825063813dbd7cf
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 849e12f5e5df..4fa88714f593 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/iptraf-ng-1.1.4-r1 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
deleted file mode 100644
index 1365cb17d748..000000000000
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7:0= virtual/os-headers !net-analyzer/iptraf
-DESCRIPTION=A console-based network monitoring utility
-EAPI=5
-HOMEPAGE=http://fedorahosted.org/iptraf-ng/
-IUSE=doc
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2 doc? ( FDL-1.1 )
-RDEPEND=>=sys-libs/ncurses-5.7-r7:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=http://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aec9fa277a860e98acfe0778d6a09687
diff --git a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.0-r1 b/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.0-r1
deleted file mode 100644
index 55599998d76e..000000000000
--- a/metadata/md5-cache/net-analyzer/iptraf-ng-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7:0= virtual/os-headers !net-analyzer/iptraf
-DESCRIPTION=A console-based network monitoring utility
-EAPI=7
-HOMEPAGE=https://github.com/iptraf-ng/iptraf-ng
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 doc? ( FDL-1.1 )
-RDEPEND=>=sys-libs/ncurses-5.7-r7:0=
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iptraf-ng/iptraf-ng/archive/v1.2.0.tar.gz -> iptraf-ng-1.2.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1d7269cb100eddd86fe8c7eaef1a4271
diff --git a/metadata/md5-cache/net-analyzer/macchanger-1.7.0 b/metadata/md5-cache/net-analyzer/macchanger-1.7.0
deleted file mode 100644
index 020ce00d8c9f..000000000000
--- a/metadata/md5-cache/net-analyzer/macchanger-1.7.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Utility for viewing/manipulating the MAC address of network interfaces
-EAPI=5
-HOMEPAGE=https://github.com/alobbs/macchanger
-KEYWORDS=amd64 arm ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz
-_md5_=26efa8e89e44c56f93378807fc239176
diff --git a/metadata/md5-cache/net-analyzer/macchanger-1.7.0-r1 b/metadata/md5-cache/net-analyzer/macchanger-1.7.0-r1
deleted file mode 100644
index 59ae42567ff6..000000000000
--- a/metadata/md5-cache/net-analyzer/macchanger-1.7.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Utility for viewing/manipulating the MAC address of network interfaces
-EAPI=6
-HOMEPAGE=https://github.com/alobbs/macchanger
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz
-_md5_=27ae079e932308f0a08fb37f48dcefe6
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
index dfeebe5e38da..4ea3bd0cb9f0 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
@@ -4,7 +4,7 @@ DESCRIPTION=A system to store and display time-series data
 EAPI=6
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) 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] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d5925a11deff820dad5206f9337cc54
+_md5_=908042907331e20eb8eb605080ee94a3
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.1 b/metadata/md5-cache/net-analyzer/wireshark-3.4.1
new file mode 100644
index 000000000000..5a85785149e7
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.4.1
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.1.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=211cdf8a8e7bdb0b9fcb42df89ed94a0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fd3b01a1f8ab..2ade162cd8ed 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/unbound-1.13.0-r1 b/metadata/md5-cache/net-dns/unbound-1.13.0-r1
new file mode 100644
index 000000000000..acce9b7ceb75
--- /dev/null
+++ b/metadata/md5-cache/net-dns/unbound-1.13.0-r1
@@ -0,0 +1,16 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) python? ( dev-lang/swig ) test? ( net-dns/ldns-utils[examples] dev-util/splint app-text/wdiff ) systemd? ( sys-apps/systemd )
+DESCRIPTION=A validating, recursive and caching DNS resolver
+EAPI=7
+HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
+IUSE=debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libressl? ( >=dev-libs/libressl-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) http2? ( net-libs/nghttp2 ) 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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
+REQUIRED_USE=python? ( ^^ ( 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/8
+SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.13.0.tar.gz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5e914d5fd80b9d668bb03a0fdc7803b9
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6964b71c4506..366eece40e56 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/prosody-0.11.7-r100 b/metadata/md5-cache/net-im/prosody-0.11.7-r100
index 0d57f60fd74d..0dbc62c64f03 100644
--- a/metadata/md5-cache/net-im/prosody-0.11.7-r100
+++ b/metadata/md5-cache/net-im/prosody-0.11.7-r100
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig test? ( lua_single_target_luajit? ( dev-lua/busted[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/busted[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/busted[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/busted[lua_targets_lua5-3(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaexpat[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luafilesystem[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasocket[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaevent[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_single_target_lua5-1? ( lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[mysql,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[postgres,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[sqlite,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasec[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-zlib[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] )
+DEPEND=lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaexpat[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luafilesystem[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasocket[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaevent[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[mysql,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[postgres,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[sqlite,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasec[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-zlib[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] )
 DESCRIPTION=Prosody is a modern XMPP communication server
 EAPI=7
 HOMEPAGE=https://prosody.im/
-IUSE=icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+IUSE=icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaexpat[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luafilesystem[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasocket[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaevent[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_single_target_lua5-1? ( lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[mysql,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[postgres,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[sqlite,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasec[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-zlib[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) virtual/tmpfiles
-REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+RDEPEND=lua_single_target_luajit? ( dev-lua/luaexpat[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaexpat[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaexpat[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaexpat[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luafilesystem[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luafilesystem[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luafilesystem[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luafilesystem[lua_targets_lua5-3(-)] ) lua_single_target_luajit? ( dev-lua/luasocket[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasocket[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasocket[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasocket[lua_targets_lua5-3(-)] ) net-im/jabber-base icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) libevent? ( lua_single_target_luajit? ( dev-lua/luaevent[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luaevent[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaevent[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaevent[lua_targets_lua5-3(-)] ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lua_single_target_lua5-1? ( lua_single_target_luajit? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-bit32[lua_targets_lua5-1(-)] ) ) mysql? ( lua_single_target_luajit? ( dev-lua/luadbi[mysql,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[mysql,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[mysql,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[mysql,lua_targets_lua5-3(-)] ) ) postgres? ( lua_single_target_luajit? ( dev-lua/luadbi[postgres,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[postgres,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[postgres,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[postgres,lua_targets_lua5-3(-)] ) ) sqlite? ( lua_single_target_luajit? ( dev-lua/luadbi[sqlite,lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luadbi[sqlite,lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luadbi[sqlite,lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luadbi[sqlite,lua_targets_lua5-3(-)] ) ) ssl? ( lua_single_target_luajit? ( dev-lua/luasec[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/luasec[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luasec[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luasec[lua_targets_lua5-3(-)] ) ) zlib? ( lua_single_target_luajit? ( dev-lua/lua-zlib[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/lua-zlib[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/lua-zlib[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/lua-zlib[lua_targets_lua5-3(-)] ) ) lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) lua_single_target_lua5-2? ( dev-lang/lua:5.2[deprecated(+)] ) lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated(+)] ) virtual/tmpfiles
+REQUIRED_USE=^^ ( icu idn ) ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://prosody.im/downloads/source/prosody-0.11.7.tar.gz
 _eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0315d51715822de9f714e0d10fa350b
+_md5_=10dd514dd130a32c1e6ad9f6e7a917a4
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b22f5b9b380c..31097e0828df 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/libslirp-4.3.1-r1 b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
index 65df103cc8a1..6ffbc356eda4 100644
--- a/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
+++ b/metadata/md5-cache/net-libs/libslirp-4.3.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisor
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:=
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.3.1/libslirp-v4.3.1.tar.gz -> libslirp-4.3.1.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d105f1e395208a721d725403ea4e7a9f
+_md5_=29a048d26effe28e2ea32a2fdff6963d
diff --git a/metadata/md5-cache/net-libs/libslirp-4.4.0 b/metadata/md5-cache/net-libs/libslirp-4.4.0
new file mode 100644
index 000000000000..5cc9a1f7e92f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libslirp-4.4.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:=
+DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services.
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/glib:=
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.4.0/libslirp-v4.4.0.tar.gz -> libslirp-4.4.0.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4d31ca79955857c3df6d415434c50818
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b0cba763c2dd..20912f91f622 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/modemmanager-1.10.0 b/metadata/md5-cache/net-misc/modemmanager-1.10.0
index 4356e58e3573..1c7c2462af6b 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.10.0
+++ b/metadata/md5-cache/net-misc/modemmanager-1.10.0
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.10.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=021f4e17fd52f72dd48e01c120c8c5e7
+_md5_=5eec82c88dcf88e3b00d261341827fd4
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1 b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
index d85a915c3eff..df55e29f8991 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.8.2.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	c156bb2ac81c822dd861424ce19bc168	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffc9914ec629ed81c48b9f0289cc3fcb
+_md5_=bd4502bb960c737b2fa9644b7d68f042
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
index 983aa41acb57..67a36ea48a31 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.9.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
 EAPI=6
 HOMEPAGE=http://www.tigervnc.org
 IUSE=dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule elibc_FreeBSD java
-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=virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) pam? ( sys-libs/pam ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrender server? ( x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/libXtst >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 xorgmodule? ( =x11-base/xorg-server-1.20* ) drm? ( x11-libs/libdrm ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xinerama? ( x11-libs/libXinerama ) !net-misc/tightvnc !net-misc/vnc !net-misc/xf4vnc java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.9.0.tar.gz -> tigervnc-1.9.0.tar.gz server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2 )
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2991345ab53a263130e54aa1159984d
+_md5_=02d9ab631537741edf9102cdcd75b49d
diff --git a/metadata/md5-cache/net-misc/unison-2.51.3_p20201024 b/metadata/md5-cache/net-misc/unison-2.51.3_p20201127
similarity index 71%
rename from metadata/md5-cache/net-misc/unison-2.51.3_p20201024
rename to metadata/md5-cache/net-misc/unison-2.51.3_p20201127
index ca092e1cbf90..e1b8324097c3 100644
--- a/metadata/md5-cache/net-misc/unison-2.51.3_p20201024
+++ b/metadata/md5-cache/net-misc/unison-2.51.3_p20201127
@@ -5,11 +5,11 @@ DESCRIPTION=Two-way cross-platform file synchronizer
 EAPI=7
 HOMEPAGE=https://www.seas.upenn.edu/~bcpierce/unison/
 IUSE=debug doc gtk +ocamlopt threads
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=gtk? ( dev-ml/lablgtk:2= || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) >=app-eselect/eselect-unison-0.4
 RESTRICT=!ocamlopt? ( strip )
 SLOT=2.51
-SRC_URI=https://github.com/bcpierce00/unison/archive/73f1bfa2476f907e2d781948ce9e764230bf8b27.tar.gz -> unison-2.51.3_p20201024.tar.gz
+SRC_URI=https://github.com/bcpierce00/unison/archive/4713e608d2f9c998ba4412fee53b94dc9bef98b9.tar.gz -> unison-2.51.3_p20201127.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=246833e1a2dbe1f928394815153ac0d6
+_md5_=e700a4307ca8214d6c7ab60c17a260aa
diff --git a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2 b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
deleted file mode 100644
index f4ed0173056d..000000000000
--- a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl[-build(-)]
-DESCRIPTION=Client for Wake-On-LAN
-EAPI=5
-HOMEPAGE=http://gsd.di.uminho.pt/jpo/software/wakeonlan/
-KEYWORDS=amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Artistic GPL-2
-RDEPEND=dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/wakeonlan-0.41.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=573c18a46ddff4d99aa6825fb19411fa
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index e4818dec9cd5..c7ca4eedc11a 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/rssguard-3.8.3 b/metadata/md5-cache/net-news/rssguard-3.8.3
new file mode 100644
index 000000000000..c35bf6414284
--- /dev/null
+++ b/metadata/md5-cache/net-news/rssguard-3.8.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tiny RSS and Atom feed reader
+EAPI=7
+HOMEPAGE=https://github.com/martinrotter/rssguard
+IUSE=debug webengine
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] )
+SLOT=0
+SRC_URI=https://github.com/martinrotter/rssguard/archive/3.8.3.tar.gz -> rssguard-3.8.3.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b68f764311f9afc75e67c4b0745495d
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 1b59059a75ab..d86afc4cc53f 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/airdcpp-webclient-2.9.0 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1
similarity index 95%
rename from metadata/md5-cache/net-p2p/airdcpp-webclient-2.9.0
rename to metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1
index a4694096ce1e..54f7c87417be 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.9.0
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.10.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 SLOT=0
-SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.9.0.tar.gz -> airdcpp-webclient-2.9.0.tar.gz
+SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.10.1.tar.gz -> airdcpp-webclient-2.10.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66cbaf00d02d1307ad4b21e5cb35540e
+_md5_=59e702bbd0b5e5e7dba63724785ef8c1
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index e279be01aa1b..b9b8b65e0948 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/tailscale-1.2.10 b/metadata/md5-cache/net-vpn/tailscale-1.2.10
new file mode 100644
index 000000000000..5b2caa282225
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tailscale-1.2.10
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Tailscale vpn client
+EAPI=7
+HOMEPAGE=https://tailscale.com
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=net-firewall/iptables virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/tailscale/tailscale/archive/v1.2.10.tar.gz -> tailscale-1.2.10.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.zip -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//github.com/!masterminds/semver/v3/@v/v3.0.3.mod -> github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//github.com/alecthomas/kingpin/@v/v2.2.6+incompatible.mod -> github.com%2Falecthomas%2Fkingpin%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.zip -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip mirror://goproxy//github.com/alexbrainman/sspi/@v/v0.0.0-20180613141037-e580b900e9f5.mod -> github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.zip -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip mirror://goproxy//github.com/anmitsu/go-shlex/@v/v0.0.0-20161002113705-648efa622239.mod -> github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.zip -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.zip mirror://goproxy//github.com/apenwarr/fixconsole/@v/v0.0.0-20191012055117-5a9f6489cc29.mod -> github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.zip -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.zip mirror://goproxy//github.com/apenwarr/w32/@v/v0.0.0-20190407065021-aa00fece76ab.mod -> github.com%2Fapenwarr%2Fw32%2F@v%2Fv0.0.0-20190407065021-aa00fece76ab.mod mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.zip -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.zip mirror://goproxy//github.com/blakesmith/ar/@v/v0.0.0-20190502131153-809d4375e1fb.mod -> github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20190502131153-809d4375e1fb.mod mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.zip -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.zip mirror://goproxy//github.com/cavaliercoder/go-cpio/@v/v0.0.0-20180626203310-925f9528c45e.mod -> github.com%2Fcavaliercoder%2Fgo-cpio%2F@v%2Fv0.0.0-20180626203310-925f9528c45e.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.zip -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.zip -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/gliderlabs/ssh/@v/v0.2.2.mod -> github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.zip -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-multierror/multierror/@v/v1.0.2.mod -> github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.zip -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip mirror://goproxy//github.com/google/rpmpack/@v/v0.0.0-20191226140753-aa36bfddb3a0.mod -> github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.zip -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.zip mirror://goproxy//github.com/goreleaser/nfpm/@v/v1.1.10.mod -> github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.8.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.zip -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.10.10.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/lxn/walk/@v/v0.0.0-20191128110447-55ccb3a9f5c1.mod -> github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.mod mirror://goproxy//github.com/lxn/win/@v/v0.0.0-20191128105842-2da648fda5b4.mod -> github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.mod mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.zip -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/mattn/go-zglob/@v/v0.0.1.mod -> github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.zip -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.30.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.zip -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip mirror://goproxy//github.com/op/go-logging/@v/v0.0.0-20160315200505-970db520ece7.mod -> github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.zip -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip mirror://goproxy//github.com/pborman/getopt/@v/v0.0.0-20190409184431-ee0cd42419d3.mod -> github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.6.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.zip -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/peterbourgon/ff/v2/@v/v2.0.0.mod -> github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.zip -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip mirror://goproxy//github.com/pkg/diff/@v/v0.0.0-20200914180035-5b29258ca4f7.mod -> github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.zip -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip mirror://goproxy//github.com/sassoftware/go-rpmutils/@v/v0.0.0-20190420191620-a8f1baeba37b.mod -> github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.zip -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.zip mirror://goproxy//github.com/tailscale/depaware/@v/v0.0.0-20201003033024-5d95aab075be.mod -> github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20200921221757-11a958a67bdd.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201008164108-2c83f43a9859.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.mod mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.zip -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.zip mirror://goproxy//github.com/tailscale/wireguard-go/@v/v0.0.0-20201021041318-a6168fd06b3f.mod -> github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.mod mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.zip -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/tcnksm/go-httpstat/@v/v0.2.0.mod -> github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.zip -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/toqueteos/webbrowser/@v/v1.2.0.mod -> github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.zip -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/ulikunitz/xz/@v/v0.5.6.mod -> github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.zip -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip mirror://goproxy//github.com/xi2/xz/@v/v0.0.0-20171230120015-48954b6210f8.mod -> github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.zip -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.zip mirror://goproxy//go4.org/mem/@v/v0.0.0-20200706164138-185c595c3ecc.mod -> go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191002192127-34f69633bfdc.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200429183012-4b2356b1ed79.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200429183012-4b2356b1ed79.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191003171128-d98b1b443823.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191007182048-72f939374954.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200501053045-e0ff5e5a1de5.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190405154228-4b34438f7a67.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190411185658-b44545bcd369.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191003212358-c178f38b412c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200501145240-bc7a7d42d5c3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200812155832-6a926be9bd1d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216052735-49a3e744a425.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201001230009-b5b87423c93b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201001230009-b5b87423c93b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201002184944-ecd9fd270d5d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.zip -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.zip mirror://goproxy//golang.zx2c4.com/wireguard/@v/v0.0.20200321-0.20200715051853-507f148e1c42.mod -> golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.mod mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.zip -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.zip mirror://goproxy//golang.zx2c4.com/wireguard/windows/@v/v0.1.2-0.20201004085714-dd60d0447f81.mod -> golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.zip -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.zip -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.zip mirror://goproxy//inet.af/netaddr/@v/v0.0.0-20200810144936-56928fe48a98.mod -> inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.mod mirror://goproxy//rsc.io/goversion/@v/v1.2.0.zip -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip mirror://goproxy//rsc.io/goversion/@v/v1.2.0.mod -> rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=63ed840609954f892562c6252d155da1
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index f7aca41bf724..2c5ba736686b 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/cddlib-094m-r1 b/metadata/md5-cache/sci-libs/cddlib-094m-r1
index 8b5a9e98f56a..cbfbc7810c2c 100644
--- a/metadata/md5-cache/sci-libs/cddlib-094m-r1
+++ b/metadata/md5-cache/sci-libs/cddlib-094m-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/gmp:0=
 SLOT=0
 SRC_URI=https://github.com/cddlib/cddlib/releases/download/0.94m/cddlib-0.94m.tar.gz
-_md5_=1307a856ff434573290aaf1abde218d1
+_md5_=54c8cf2b1536738ab747d64710fc1e0f
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.9 b/metadata/md5-cache/sci-libs/fftw-3.3.9
new file mode 100644
index 000000000000..36e98c6fe31f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.9
@@ -0,0 +1,15 @@
+BDEPEND=quad? ( sys-devel/gcc[fortran] ) test? ( dev-lang/perl )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
+DESCRIPTION=Fast C library for the Discrete Fourier Transform
+EAPI=7
+HOMEPAGE=http://www.fftw.org/
+IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
+RESTRICT=!test? ( test )
+SLOT=3.0/3
+SRC_URI=http://www.fftw.org/fftw-3.3.9.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0749c9a1d81a37a732e95a4d686cc8ae
diff --git a/metadata/md5-cache/sci-libs/fftw-9999 b/metadata/md5-cache/sci-libs/fftw-9999
index 328cbfe37485..377650054ccd 100644
--- a/metadata/md5-cache/sci-libs/fftw-9999
+++ b/metadata/md5-cache/sci-libs/fftw-9999
@@ -1,13 +1,14 @@
+BDEPEND=quad? ( sys-devel/gcc[fortran] ) test? ( dev-lang/perl ) >=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=compile configure install prepare pretend setup test unpack
-DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quad? ( sys-devel/gcc[fortran] ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) >=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]
+DEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
 DESCRIPTION=Fast C library for the Discrete Fourier Transform
-EAPI=6
+EAPI=7
 HOMEPAGE=http://www.fftw.org/
-IUSE=cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=3.0/3
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88563f54bb7fc9cebffdd31aa2f4b608
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=52ce62db61a458883263ba720383e10c
diff --git a/metadata/md5-cache/sci-libs/gdal-3.2.0 b/metadata/md5-cache/sci-libs/gdal-3.2.0-r1
similarity index 99%
rename from metadata/md5-cache/sci-libs/gdal-3.2.0
rename to metadata/md5-cache/sci-libs/gdal-3.2.0-r1
index 8fcdb1d28908..136bd7f9fb57 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.2.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.2.0-r1
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_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/numpy[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(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) spatialite? ( sqlite )
-SLOT=0/3.0
+SLOT=0/3.2
 SRC_URI=https://download.osgeo.org/gdal/3.2.0/gdal-3.2.0.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=737fbcfdd2906b68e89e21fcef0b364f
+_md5_=793e269d6f77c1aaf1b31b83886f116f
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0-r1 b/metadata/md5-cache/sci-libs/vtk-8.2.0-r1
new file mode 100644
index 000000000000..f9ae3cd95e63
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/vtk-8.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
+DEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_6? ( python? ( dev-python/mpi4py[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( python? ( dev-python/mpi4py[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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] ) python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_6? ( python? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( python? ( dev-python/PyQt5[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_6? ( dev-python/autobahn[python_targets_python3_6(-)] dev-python/constantly[python_targets_python3_6(-)] dev-python/hyperlink[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)] dev-python/txaio[python_targets_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] dev-python/constantly[python_targets_python3_7(-)] dev-python/hyperlink[python_targets_python3_7(-)] dev-python/incremental[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] dev-python/twisted[python_targets_python3_7(-)] dev-python/txaio[python_targets_python3_7(-)] dev-python/zope-interface[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=The Visualization Toolkit
+EAPI=7
+HOMEPAGE=https://www.vtk.org/
+IUSE=all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi odbc offscreen postgres python qt5 R rendering tbb tcl theora tk video_cards_nvidia views web +X xdmf2 elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD LGPL-2
+RDEPEND=app-arch/lz4 dev-cpp/eigen dev-db/sqlite dev-libs/double-conversion:0= dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=dev-libs/pugixml-1.11 >=media-libs/freetype-2.5.4 media-libs/glew:0= >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( media-video/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python_single_target_python3_6? ( python? ( dev-python/mpi4py[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( python? ( dev-python/mpi4py[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( python? ( dev-python/mpi4py[python_targets_python3_8(-)] ) ) ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) 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] ) python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sip[python_targets_python3_8(-)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtx11extras:5 python_single_target_python3_6? ( python? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( python? ( dev-python/PyQt5[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( python? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_6? ( dev-python/autobahn[python_targets_python3_6(-)] dev-python/constantly[python_targets_python3_6(-)] dev-python/hyperlink[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)] dev-python/txaio[python_targets_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] dev-python/constantly[python_targets_python3_7(-)] dev-python/hyperlink[python_targets_python3_7(-)] dev-python/incremental[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] dev-python/twisted[python_targets_python3_7(-)] dev-python/txaio[python_targets_python3_7(-)] dev-python/zope-interface[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/autobahn[python_targets_python3_8(-)] dev-python/constantly[python_targets_python3_8(-)] dev-python/hyperlink[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/txaio[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2f4289380c8f0dc1ec222a526af4a16
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b2ad4cc31fc2..319b2dff6a71 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/gentoo-systemd-integration-9 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
new file mode 100644
index 000000000000..dac0dbe81166
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=prepare
+DEPEND=>=sys-apps/systemd-207
+DESCRIPTION=systemd integration files for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoo-systemd-integration-9.tar.gz
+_md5_=85241200d25772ed4bfbefb12235fdf0
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
index 7fdd9d6d47d8..de5469f25d41 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
@@ -1,11 +1,12 @@
+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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
-DEPEND=>=sys-apps/systemd-207 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 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+DEPEND=>=sys-apps/systemd-207
 DESCRIPTION=systemd integration files for Gentoo
-EAPI=6
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Systemd
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev
 SLOT=0
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e951ecca239381656dc502c1b56924dc
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=85241200d25772ed4bfbefb12235fdf0
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index b3a580527c67..fddb56cbaa99 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/raspberrypi-wifi-ucode-20190114.1_p10 b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p10
new file mode 100644
index 000000000000..096699ca7f9f
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/raspberrypi-wifi-ucode-20190114.1_p10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare pretend
+DESCRIPTION=Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs
+EAPI=7
+HOMEPAGE=https://github.com/RPi-Distro/firmware-nonfree https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree
+KEYWORDS=~arm ~arm64
+LICENSE=Broadcom
+RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
+SLOT=0
+SRC_URI=https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-nonfree_20190114-1+rpt10.debian.tar.xz
+_md5_=d1a1690efa3fe5263e538c39590fe932
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index d8d56163ae7b..ed48b1e17b2f 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/android-file-transfer-linux-4.1 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
new file mode 100644
index 000000000000..6755a3ed4ceb
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse: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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) taglib? ( media-libs/taglib ) zune? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Android File Transfer for Linux
+EAPI=7
+HOMEPAGE=https://github.com/whoozle/android-file-transfer-linux
+IUSE=fuse libressl python qt5 taglib zune python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse: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] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pybind11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pybind11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pybind11[python_targets_python3_9(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) taglib? ( media-libs/taglib ) zune? ( !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 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://github.com/whoozle/android-file-transfer-linux/archive/v4.1.tar.gz -> android-file-transfer-linux-4.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41b86553d5dfe66ae9afab2923e71213
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.1 b/metadata/md5-cache/sys-fs/mdadm-4.1
index a9dcd90ce7fe..66cb455be1e1 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.1
+++ b/metadata/md5-cache/sys-fs/mdadm-4.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.1-3.debian.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c04bc17f5e9a1a4ddc3ea4afad5ee1d7
+_md5_=e3dda32de6338595790d8cca8d5ed2ee
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.10.0 b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
new file mode 100644
index 000000000000..4d148f321206
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.10.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/inih nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3
+DESCRIPTION=xfs filesystem utilities
+EAPI=7
+HOMEPAGE=https://xfs.wiki.kernel.org/
+IUSE=icu libedit nls split-usr
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) !<sys-fs/xfsdump-3
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.10.0.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a6cf039be9c076a6bf38c869f813afac
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d01436b64c35..e3534f82281f 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.0
new file mode 100644
index 000000000000..59accec07807
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-1.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-1.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4484ff5969d25a31e4c40101faa47dcf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1
new file mode 100644
index 000000000000..b5c7cd6d6389
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-2.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7fe8b03a0be1bb7235f4d20937e4b5a2
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-5.10.0 b/metadata/md5-cache/sys-kernel/linux-docs-5.10.0
new file mode 100644
index 000000000000..7192a98534c6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-docs-5.10.0
@@ -0,0 +1,12 @@
+BDEPEND=media-libs/fontconfig
+DEFINED_PHASES=compile install
+DEPEND=dev-python/sphinx
+DESCRIPTION=Developer documentation generated from the Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7112b55246f70942fb82320aa14cdf36
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1
new file mode 100644
index 000000000000..339459689a7a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.10_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10_p1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf1.diff -> pf-sources-5.10_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.10-1.extras.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=81b8cc000b97905db21c170c3891e759
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
new file mode 100644
index 000000000000..83c3bb9ae59b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.9_p7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf7.diff -> pf-sources-5.9_p7.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=81b8cc000b97905db21c170c3891e759
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201 b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
new file mode 100644
index 000000000000..5f419b1b5a43
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.79_p20201201
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prerm pretend
+DESCRIPTION=Raspberry Pi (all versions) kernel and modules
+EAPI=7
+HOMEPAGE=https://github.com/raspberrypi/firmware
+KEYWORDS=-* ~arm ~arm64
+LICENSE=GPL-2 raspberrypi-videocore-bin
+RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20201201.tar.gz -> raspberrypi-firmware-1.20201201.tar.gz
+_eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=aaef5312583ce74dc9e0e4051b063ffb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.1
similarity index 84%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.0
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.1
index 16de5c8db5d1..fff1cb9f9b9c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index db8c8d97bd86..faa24a40fa23 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/db-4.2.52_p5-r3 b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r3
index 0e49c9bd63d6..3d249d617d24 100644
--- a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r3
+++ b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Oracle Berkeley DB
 EAPI=7
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=tcl java doc cxx doc test examples elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=4.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	db	bbb99da6584af9679220102029c6883e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f12358972b1fb8e19bcd5655f41e447
+_md5_=c8b367d1ae3aef6e3aacb6b40d3c2295
diff --git a/metadata/md5-cache/sys-libs/db-6.2.38 b/metadata/md5-cache/sys-libs/db-6.2.38
index 498035240d86..3bf3db670013 100644
--- a/metadata/md5-cache/sys-libs/db-6.2.38
+++ b/metadata/md5-cache/sys-libs/db-6.2.38
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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
+DEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) kernel_linux? ( >=sys-devel/binutils-2.16.1 ) kernel_SunOS? ( >=sys-devel/binutils-2.16.1 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=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
 DESCRIPTION=Oracle Berkeley DB
 EAPI=6
 HOMEPAGE=http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html
 IUSE=doc java cxx tcl test doc test examples elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=test? ( tcl )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=6.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.2.38.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	db	bbb99da6584af9679220102029c6883e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d867db7432e53875c29d6d92adc2aac
+_md5_=ccc93fa1c0dd01e187348f9b5fdf5961
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.24 b/metadata/md5-cache/sys-libs/libblockdev-2.24
index 63efab835ed8..3a8e9efd3a19 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.24
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.24
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) >=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=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.24-1/libblockdev-2.24.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d6ebc557186d4d2f05ddd93eb1e7dc7
+_md5_=55ec86759d4dc3b418755ac786e72fb1
diff --git a/metadata/md5-cache/sys-libs/libblockdev-9999 b/metadata/md5-cache/sys-libs/libblockdev-9999
index a6f49bd7ffab..bdefe2ebcb56 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-9999
+++ b/metadata/md5-cache/sys-libs/libblockdev-9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/autoconf-archive dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) >=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=configure install prepare setup unpack
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=809aa9325168c51f2a0b81f17b4f725e
+_md5_=470fc6f521685c1c845cb3737fefb89e
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1 b/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1
new file mode 100644
index 000000000000..3d966d4febd3
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.8.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python? ( >=dev-lang/swig-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 test
+DEPEND=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(-)] ) sys-kernel/linux-headers
+DESCRIPTION=POSIX 1003.1e capabilities
+EAPI=7
+HOMEPAGE=https://people.redhat.com/sgrubb/libcap-ng/
+IUSE=python static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=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 ) )
+SLOT=0
+SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.1.tar.gz https://src.fedoraproject.org/rpms/libcap-ng/raw/49e3114cf75fabe9919300e42f7b151eee9e37d1/f/libcap-ng-0.8.2-apply.patch https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fdb21873e991c3b79846abfe06bb1334
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.8.2 b/metadata/md5-cache/sys-libs/libcap-ng-0.8.2-r1
similarity index 92%
rename from metadata/md5-cache/sys-libs/libcap-ng-0.8.2
rename to metadata/md5-cache/sys-libs/libcap-ng-0.8.2-r1
index 90fa663f3858..23ab5087fb7f 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.8.2
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.8.2-r1
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
 RDEPEND=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 ) )
 SLOT=0
-SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
+SRC_URI=https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a70073dc664ac2af6c4350b5fc35fb57
+_md5_=a332d18078edb2343560595db7f12027
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.5.0 b/metadata/md5-cache/sys-libs/libunwind-1.5.0
index f5451a7c888e..deb51a47ba02 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.5.0
+++ b/metadata/md5-cache/sys-libs/libunwind-1.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
 IUSE=debug debug-frame doc libatomic lzma +static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lzma? ( app-arch/xz-utils[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0/8
 SRC_URI=mirror://nongnu/libunwind/libunwind-1.5.0.tar.gz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa82704e3776f032f609a0c515883457
+_md5_=2ceae76d6f31c6772aa3589e06f47716
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.1 b/metadata/md5-cache/sys-libs/talloc-2.3.1
index c35c47c3593c..14ad67b2899f 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
-RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) !!<sys-libs/talloc-2.0.5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=f3fd09a28ed891f319a2df9dddb0c75e
+_md5_=9c836f09ea96eb0a5017200534aebaf2
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index d45e4140e13e..3dfddd482b95 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/httpd-php-7.2 b/metadata/md5-cache/virtual/httpd-php-7.2
index 39ba889e5dc1..c097ce3151ac 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.2
+++ b/metadata/md5-cache/virtual/httpd-php-7.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.2[fpm] dev-lang/php:7.2[apache2] dev-lang/php:7.2[cgi] )
 SLOT=7.2
-_md5_=e80cbe3d7ffb5f7e09cb63258b534856
+_md5_=892ab7fe68ec3a505eef66f1437195d8
diff --git a/metadata/md5-cache/virtual/httpd-php-7.3 b/metadata/md5-cache/virtual/httpd-php-7.3
index 8c741a2cf832..8a4003f0f114 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.3
+++ b/metadata/md5-cache/virtual/httpd-php-7.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.3[fpm] dev-lang/php:7.3[apache2] dev-lang/php:7.3[cgi] )
 SLOT=7.3
-_md5_=e80cbe3d7ffb5f7e09cb63258b534856
+_md5_=892ab7fe68ec3a505eef66f1437195d8
diff --git a/metadata/md5-cache/virtual/httpd-php-7.4 b/metadata/md5-cache/virtual/httpd-php-7.4
index 0740c53c03fc..23d1bbff11ca 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.4
+++ b/metadata/md5-cache/virtual/httpd-php-7.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.4[fpm] dev-lang/php:7.4[apache2] dev-lang/php:7.4[cgi] )
 SLOT=7.4
-_md5_=76bd118bd72844252c529089ca540f0f
+_md5_=863a04cd4e4b3075ace7cc22c102deb8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index f281b29739f1..0cb79b5b38b4 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/airdcpp-webui-2.9.0 b/metadata/md5-cache/www-apps/airdcpp-webui-2.9.0
deleted file mode 100644
index 174aad9e6eff..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.9.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Web interface for airdcpp-webclient
-EAPI=7
-HOMEPAGE=https://airdcpp-web.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.9*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.9.0.tgz
-_md5_=6c9494df11417428198de308ea279885
diff --git a/metadata/md5-cache/www-apps/gitea-1.12.6 b/metadata/md5-cache/www-apps/gitea-1.13.0
similarity index 91%
rename from metadata/md5-cache/www-apps/gitea-1.12.6
rename to metadata/md5-cache/www-apps/gitea-1.13.0
index 7792912645a2..22ad16dc67d0 100644
--- a/metadata/md5-cache/www-apps/gitea-1.12.6
+++ b/metadata/md5-cache/www-apps/gitea-1.13.0
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.12.6/gitea-src-1.12.6.tar.gz -> gitea-1.12.6.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.13.0/gitea-src-1.13.0.tar.gz -> gitea-1.13.0.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f1fe972dfb095d49c62c9d57eff27f2
+_md5_=c201f2ff2a412bdb4adc949ea1309bd6
diff --git a/metadata/md5-cache/www-apps/gitea-9999 b/metadata/md5-cache/www-apps/gitea-9999
index f2c23c707de2..c1660b37267b 100644
--- a/metadata/md5-cache/www-apps/gitea-9999
+++ b/metadata/md5-cache/www-apps/gitea-9999
@@ -8,7 +8,7 @@ IUSE=+acct pam sqlite +filecaps
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 PROPERTIES=live
 RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
-RESTRICT=strip
+RESTRICT=test
 SLOT=0
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	3e7ec3d6619213460c85e2aa48398441	go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2668bf91496e7ca8c39485f0ce78dd8
+_md5_=91c77a6df00c658b979b05a1ddcbaf1c
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
index 0d7d1f412eda..c7f346efe28e 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=A customizable PHP script that displays information about your syste
 EAPI=7
 HOMEPAGE=https://rk4an.github.com/phpsysinfo/
 IUSE=vhosts
-KEYWORDS=amd64 hppa ppc ppc64 x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=app-admin/webapp-config-1.50.15
 SLOT=3.3.2
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.2.tar.gz -> phpsysinfo-3.3.2.tar.gz
 _eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=ed247122d7c24969a341c0b8619520e3
+_md5_=d4b49d9907e83f8d052045ac8ad5a9f9
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 524688a422e9..3af8db2a0ab0 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/firefox-78.6.0 b/metadata/md5-cache/www-client/firefox-78.6.0
new file mode 100644
index 000000000000..3ef6ae812209
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-78.6.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=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.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
+SLOT=0/esr78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/source/firefox-78.6.0esr.source.tar.xz -> firefox-78.6.0esr.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-07.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.6.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.6.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.6.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.6.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.6.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.6.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.6.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.6.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.6.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.6.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.6.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.6.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.6.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.6.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.6.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.6.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.6.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.6.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.6.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.6.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.6.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.6.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.6.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.6.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.6.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.6.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.6.0esr-zh-TW.xpi )
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=50b11781efbc264e044a12175a4ed79e
diff --git a/metadata/md5-cache/www-client/firefox-84.0 b/metadata/md5-cache/www-client/firefox-84.0
new file mode 100644
index 000000000000..d92a5ff489e4
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-84.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.22.1 virtual/pkgconfig >=virtual/rust-1.44.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=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.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.59 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.59 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
+SLOT=0/84
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/84.0/source/firefox-84.0.source.tar.xz -> firefox-84.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-84-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ach.xpi -> firefox-84.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/af.xpi -> firefox-84.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/an.xpi -> firefox-84.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ar.xpi -> firefox-84.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ast.xpi -> firefox-84.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/az.xpi -> firefox-84.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/be.xpi -> firefox-84.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bg.xpi -> firefox-84.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bn.xpi -> firefox-84.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/br.xpi -> firefox-84.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bs.xpi -> firefox-84.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-84.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ca.xpi -> firefox-84.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cak.xpi -> firefox-84.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cs.xpi -> firefox-84.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cy.xpi -> firefox-84.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/da.xpi -> firefox-84.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/de.xpi -> firefox-84.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/dsb.xpi -> firefox-84.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/el.xpi -> firefox-84.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/en-CA.xpi -> firefox-84.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/en-GB.xpi -> firefox-84.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/eo.xpi -> firefox-84.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-AR.xpi -> firefox-84.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-CL.xpi -> firefox-84.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-ES.xpi -> firefox-84.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-MX.xpi -> firefox-84.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/et.xpi -> firefox-84.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/eu.xpi -> firefox-84.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fa.xpi -> firefox-84.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ff.xpi -> firefox-84.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fi.xpi -> firefox-84.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fr.xpi -> firefox-84.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-84.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-84.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gd.xpi -> firefox-84.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gl.xpi -> firefox-84.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gn.xpi -> firefox-84.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-84.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/he.xpi -> firefox-84.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-84.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hr.xpi -> firefox-84.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hsb.xpi -> firefox-84.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hu.xpi -> firefox-84.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-84.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ia.xpi -> firefox-84.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/id.xpi -> firefox-84.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/is.xpi -> firefox-84.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/it.xpi -> firefox-84.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ja.xpi -> firefox-84.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ka.xpi -> firefox-84.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kab.xpi -> firefox-84.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kk.xpi -> firefox-84.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/km.xpi -> firefox-84.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kn.xpi -> firefox-84.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ko.xpi -> firefox-84.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lij.xpi -> firefox-84.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lt.xpi -> firefox-84.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lv.xpi -> firefox-84.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/mk.xpi -> firefox-84.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/mr.xpi -> firefox-84.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ms.xpi -> firefox-84.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/my.xpi -> firefox-84.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-84.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-84.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nl.xpi -> firefox-84.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-84.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/oc.xpi -> firefox-84.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-84.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pl.xpi -> firefox-84.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-84.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-84.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/rm.xpi -> firefox-84.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ro.xpi -> firefox-84.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ru.xpi -> firefox-84.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/si.xpi -> firefox-84.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sk.xpi -> firefox-84.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sl.xpi -> firefox-84.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/son.xpi -> firefox-84.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sq.xpi -> firefox-84.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sr.xpi -> firefox-84.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-84.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ta.xpi -> firefox-84.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/te.xpi -> firefox-84.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/th.xpi -> firefox-84.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/tl.xpi -> firefox-84.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/tr.xpi -> firefox-84.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/trs.xpi -> firefox-84.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/uk.xpi -> firefox-84.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ur.xpi -> firefox-84.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/uz.xpi -> firefox-84.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/vi.xpi -> firefox-84.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/xh.xpi -> firefox-84.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-84.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-84.0-zh-TW.xpi )
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fc9e44cd33954131c21e41a41f386fc
diff --git a/metadata/md5-cache/www-client/firefox-84.0_rc2 b/metadata/md5-cache/www-client/firefox-84.0_rc2
deleted file mode 100644
index 871f2fd7e6df..000000000000
--- a/metadata/md5-cache/www-client/firefox-84.0_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.15.0 >=net-libs/nodejs-10.22.1 virtual/pkgconfig >=virtual/rust-1.44.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=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.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.59 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.59 >=dev-libs/nspr-4.29 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) screencast? ( wayland )
-SLOT=0/84
-SRC_URI=https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/source/firefox-84.0.source.tar.xz -> firefox-84.0_rc2.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-84-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-84-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ach.xpi -> firefox-84.0_rc2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/af.xpi -> firefox-84.0_rc2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/an.xpi -> firefox-84.0_rc2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ar.xpi -> firefox-84.0_rc2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ast.xpi -> firefox-84.0_rc2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/az.xpi -> firefox-84.0_rc2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/be.xpi -> firefox-84.0_rc2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/bg.xpi -> firefox-84.0_rc2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/bn.xpi -> firefox-84.0_rc2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/br.xpi -> firefox-84.0_rc2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/bs.xpi -> firefox-84.0_rc2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-84.0_rc2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ca.xpi -> firefox-84.0_rc2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/cak.xpi -> firefox-84.0_rc2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/cs.xpi -> firefox-84.0_rc2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/cy.xpi -> firefox-84.0_rc2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/da.xpi -> firefox-84.0_rc2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/de.xpi -> firefox-84.0_rc2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/dsb.xpi -> firefox-84.0_rc2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/el.xpi -> firefox-84.0_rc2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/en-CA.xpi -> firefox-84.0_rc2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/en-GB.xpi -> firefox-84.0_rc2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/eo.xpi -> firefox-84.0_rc2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/es-AR.xpi -> firefox-84.0_rc2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/es-CL.xpi -> firefox-84.0_rc2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/es-ES.xpi -> firefox-84.0_rc2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/es-MX.xpi -> firefox-84.0_rc2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/et.xpi -> firefox-84.0_rc2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/eu.xpi -> firefox-84.0_rc2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/fa.xpi -> firefox-84.0_rc2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ff.xpi -> firefox-84.0_rc2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/fi.xpi -> firefox-84.0_rc2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/fr.xpi -> firefox-84.0_rc2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/fy-NL.xpi -> firefox-84.0_rc2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ga-IE.xpi -> firefox-84.0_rc2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/gd.xpi -> firefox-84.0_rc2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/gl.xpi -> firefox-84.0_rc2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/gn.xpi -> firefox-84.0_rc2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/gu-IN.xpi -> firefox-84.0_rc2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/he.xpi -> firefox-84.0_rc2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/hi-IN.xpi -> firefox-84.0_rc2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/hr.xpi -> firefox-84.0_rc2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/hsb.xpi -> firefox-84.0_rc2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/hu.xpi -> firefox-84.0_rc2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/hy-AM.xpi -> firefox-84.0_rc2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ia.xpi -> firefox-84.0_rc2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/id.xpi -> firefox-84.0_rc2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/is.xpi -> firefox-84.0_rc2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/it.xpi -> firefox-84.0_rc2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ja.xpi -> firefox-84.0_rc2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ka.xpi -> firefox-84.0_rc2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/kab.xpi -> firefox-84.0_rc2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/kk.xpi -> firefox-84.0_rc2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/km.xpi -> firefox-84.0_rc2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/kn.xpi -> firefox-84.0_rc2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ko.xpi -> firefox-84.0_rc2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/lij.xpi -> firefox-84.0_rc2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/lt.xpi -> firefox-84.0_rc2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/lv.xpi -> firefox-84.0_rc2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/mk.xpi -> firefox-84.0_rc2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/mr.xpi -> firefox-84.0_rc2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ms.xpi -> firefox-84.0_rc2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/my.xpi -> firefox-84.0_rc2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/nb-NO.xpi -> firefox-84.0_rc2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ne-NP.xpi -> firefox-84.0_rc2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/nl.xpi -> firefox-84.0_rc2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/nn-NO.xpi -> firefox-84.0_rc2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/oc.xpi -> firefox-84.0_rc2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/pa-IN.xpi -> firefox-84.0_rc2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/pl.xpi -> firefox-84.0_rc2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/pt-BR.xpi -> firefox-84.0_rc2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/pt-PT.xpi -> firefox-84.0_rc2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/rm.xpi -> firefox-84.0_rc2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ro.xpi -> firefox-84.0_rc2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ru.xpi -> firefox-84.0_rc2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/si.xpi -> firefox-84.0_rc2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/sk.xpi -> firefox-84.0_rc2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/sl.xpi -> firefox-84.0_rc2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/son.xpi -> firefox-84.0_rc2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/sq.xpi -> firefox-84.0_rc2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/sr.xpi -> firefox-84.0_rc2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/sv-SE.xpi -> firefox-84.0_rc2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ta.xpi -> firefox-84.0_rc2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/te.xpi -> firefox-84.0_rc2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/th.xpi -> firefox-84.0_rc2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/tl.xpi -> firefox-84.0_rc2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/tr.xpi -> firefox-84.0_rc2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/trs.xpi -> firefox-84.0_rc2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/uk.xpi -> firefox-84.0_rc2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/ur.xpi -> firefox-84.0_rc2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/uz.xpi -> firefox-84.0_rc2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/vi.xpi -> firefox-84.0_rc2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/xh.xpi -> firefox-84.0_rc2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/zh-CN.xpi -> firefox-84.0_rc2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/candidates/84.0-candidates/build2/linux-x86_64/xpi/zh-TW.xpi -> firefox-84.0_rc2-zh-TW.xpi )
-_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=684b3a419267a9fbdfcc1b7ec8095f42
diff --git a/metadata/md5-cache/www-client/firefox-bin-78.6.0 b/metadata/md5-cache/www-client/firefox-bin-78.6.0
new file mode 100644
index 000000000000..19a3fded86eb
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-78.6.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/esr78
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/en-US/firefox-78.6.0esr.tar.bz2 -> firefox-bin_x86_64-78.6.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-i686/en-US/firefox-78.6.0esr.tar.bz2 -> firefox-bin_i686-78.6.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ach.xpi -> firefox-78.6.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/af.xpi -> firefox-78.6.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/an.xpi -> firefox-78.6.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ar.xpi -> firefox-78.6.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ast.xpi -> firefox-78.6.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/az.xpi -> firefox-78.6.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/be.xpi -> firefox-78.6.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bg.xpi -> firefox-78.6.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bn.xpi -> firefox-78.6.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/br.xpi -> firefox-78.6.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/bs.xpi -> firefox-78.6.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-78.6.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ca.xpi -> firefox-78.6.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cak.xpi -> firefox-78.6.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cs.xpi -> firefox-78.6.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/cy.xpi -> firefox-78.6.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/da.xpi -> firefox-78.6.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/de.xpi -> firefox-78.6.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-78.6.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/el.xpi -> firefox-78.6.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-78.6.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-78.6.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/eo.xpi -> firefox-78.6.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-78.6.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-78.6.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-78.6.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-78.6.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/et.xpi -> firefox-78.6.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/eu.xpi -> firefox-78.6.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fa.xpi -> firefox-78.6.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ff.xpi -> firefox-78.6.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fi.xpi -> firefox-78.6.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fr.xpi -> firefox-78.6.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-78.6.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-78.6.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gd.xpi -> firefox-78.6.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gl.xpi -> firefox-78.6.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gn.xpi -> firefox-78.6.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-78.6.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/he.xpi -> firefox-78.6.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-78.6.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hr.xpi -> firefox-78.6.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-78.6.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hu.xpi -> firefox-78.6.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-78.6.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ia.xpi -> firefox-78.6.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/id.xpi -> firefox-78.6.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/is.xpi -> firefox-78.6.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/it.xpi -> firefox-78.6.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ja.xpi -> firefox-78.6.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ka.xpi -> firefox-78.6.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kab.xpi -> firefox-78.6.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kk.xpi -> firefox-78.6.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/km.xpi -> firefox-78.6.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/kn.xpi -> firefox-78.6.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ko.xpi -> firefox-78.6.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lij.xpi -> firefox-78.6.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lt.xpi -> firefox-78.6.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/lv.xpi -> firefox-78.6.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/mk.xpi -> firefox-78.6.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/mr.xpi -> firefox-78.6.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ms.xpi -> firefox-78.6.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/my.xpi -> firefox-78.6.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-78.6.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-78.6.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nl.xpi -> firefox-78.6.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-78.6.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/oc.xpi -> firefox-78.6.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-78.6.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pl.xpi -> firefox-78.6.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-78.6.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-78.6.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/rm.xpi -> firefox-78.6.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ro.xpi -> firefox-78.6.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ru.xpi -> firefox-78.6.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/si.xpi -> firefox-78.6.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sk.xpi -> firefox-78.6.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sl.xpi -> firefox-78.6.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/son.xpi -> firefox-78.6.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sq.xpi -> firefox-78.6.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sr.xpi -> firefox-78.6.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-78.6.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ta.xpi -> firefox-78.6.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/te.xpi -> firefox-78.6.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/th.xpi -> firefox-78.6.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/tl.xpi -> firefox-78.6.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/tr.xpi -> firefox-78.6.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/trs.xpi -> firefox-78.6.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/uk.xpi -> firefox-78.6.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/ur.xpi -> firefox-78.6.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/uz.xpi -> firefox-78.6.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/vi.xpi -> firefox-78.6.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/xh.xpi -> firefox-78.6.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-78.6.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.6.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-78.6.0esr-zh-TW.xpi )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf6188085674bc3058e1efb7bc71b370
diff --git a/metadata/md5-cache/www-client/firefox-bin-84.0 b/metadata/md5-cache/www-client/firefox-bin-84.0
new file mode 100644
index 000000000000..978453004867
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-84.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=0/84
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/en-US/firefox-84.0.tar.bz2 -> firefox-bin_x86_64-84.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-i686/en-US/firefox-84.0.tar.bz2 -> firefox-bin_i686-84.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ach.xpi -> firefox-84.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/af.xpi -> firefox-84.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/an.xpi -> firefox-84.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ar.xpi -> firefox-84.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ast.xpi -> firefox-84.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/az.xpi -> firefox-84.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/be.xpi -> firefox-84.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bg.xpi -> firefox-84.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bn.xpi -> firefox-84.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/br.xpi -> firefox-84.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/bs.xpi -> firefox-84.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-84.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ca.xpi -> firefox-84.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cak.xpi -> firefox-84.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cs.xpi -> firefox-84.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/cy.xpi -> firefox-84.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/da.xpi -> firefox-84.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/de.xpi -> firefox-84.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/dsb.xpi -> firefox-84.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/el.xpi -> firefox-84.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/en-CA.xpi -> firefox-84.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/en-GB.xpi -> firefox-84.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/eo.xpi -> firefox-84.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-AR.xpi -> firefox-84.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-CL.xpi -> firefox-84.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-ES.xpi -> firefox-84.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/es-MX.xpi -> firefox-84.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/et.xpi -> firefox-84.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/eu.xpi -> firefox-84.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fa.xpi -> firefox-84.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ff.xpi -> firefox-84.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fi.xpi -> firefox-84.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fr.xpi -> firefox-84.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-84.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-84.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gd.xpi -> firefox-84.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gl.xpi -> firefox-84.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gn.xpi -> firefox-84.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-84.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/he.xpi -> firefox-84.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-84.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hr.xpi -> firefox-84.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hsb.xpi -> firefox-84.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hu.xpi -> firefox-84.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-84.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ia.xpi -> firefox-84.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/id.xpi -> firefox-84.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/is.xpi -> firefox-84.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/it.xpi -> firefox-84.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ja.xpi -> firefox-84.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ka.xpi -> firefox-84.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kab.xpi -> firefox-84.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kk.xpi -> firefox-84.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/km.xpi -> firefox-84.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/kn.xpi -> firefox-84.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ko.xpi -> firefox-84.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lij.xpi -> firefox-84.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lt.xpi -> firefox-84.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/lv.xpi -> firefox-84.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/mk.xpi -> firefox-84.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/mr.xpi -> firefox-84.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ms.xpi -> firefox-84.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/my.xpi -> firefox-84.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-84.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-84.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nl.xpi -> firefox-84.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-84.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/oc.xpi -> firefox-84.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-84.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pl.xpi -> firefox-84.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-84.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-84.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/rm.xpi -> firefox-84.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ro.xpi -> firefox-84.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ru.xpi -> firefox-84.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/si.xpi -> firefox-84.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sk.xpi -> firefox-84.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sl.xpi -> firefox-84.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/son.xpi -> firefox-84.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sq.xpi -> firefox-84.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sr.xpi -> firefox-84.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-84.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ta.xpi -> firefox-84.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/te.xpi -> firefox-84.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/th.xpi -> firefox-84.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/tl.xpi -> firefox-84.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/tr.xpi -> firefox-84.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/trs.xpi -> firefox-84.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/uk.xpi -> firefox-84.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/ur.xpi -> firefox-84.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/uz.xpi -> firefox-84.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/vi.xpi -> firefox-84.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/xh.xpi -> firefox-84.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-84.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/84.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-84.0-zh-TW.xpi )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=46c0026e58f92e58ededf035befab86a
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 682f07b8316c..e350b697aec9 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-drivers-1.20-r2 b/metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
index bbaaca732e63..7eccbea34fe8 100644
--- a/metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
+++ b/metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
@@ -3,8 +3,8 @@ DESCRIPTION=Meta package containing deps on all xorg drivers
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=video_cards_amdgpu video_cards_ast video_cards_dummy video_cards_fbdev video_cards_freedreno video_cards_geode video_cards_glint video_cards_i915 video_cards_i965 video_cards_intel video_cards_mga video_cards_nouveau video_cards_nv video_cards_omap video_cards_qxl video_cards_r128 video_cards_radeon video_cards_radeonsi video_cards_siliconmotion video_cards_tegra video_cards_vc4 video_cards_vesa video_cards_via video_cards_virtualbox video_cards_vmware video_cards_nvidia input_devices_elographics input_devices_evdev input_devices_joystick input_devices_libinput input_devices_vmmouse input_devices_void input_devices_synaptics input_devices_wacom
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
 PDEPEND=input_devices_elographics? ( x11-drivers/xf86-input-elographics ) input_devices_evdev? ( >=x11-base/xorg-server-1.20[udev] >=x11-drivers/xf86-input-evdev-2.10.6 ) input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) input_devices_libinput? ( >=x11-base/xorg-server-1.20[udev] >=x11-drivers/xf86-input-libinput-0.27.1 ) input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) input_devices_void? ( x11-drivers/xf86-input-void ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) video_cards_ast? ( x11-drivers/xf86-video-ast ) video_cards_dummy? ( x11-drivers/xf86-video-dummy ) video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) video_cards_freedreno? ( >=x11-base/xorg-server-1.20[-minimal] ) video_cards_geode? ( x11-drivers/xf86-video-geode ) video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) video_cards_i915? ( x11-drivers/xf86-video-intel ) video_cards_i965? ( >=x11-base/xorg-server-1.20[-minimal] ) video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) video_cards_qxl? ( x11-drivers/xf86-video-qxl ) video_cards_nvidia? ( x11-drivers/nvidia-drivers ) video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) video_cards_tegra? ( >=x11-base/xorg-server-1.20[-minimal] ) video_cards_vc4? ( >=x11-base/xorg-server-1.20[-minimal] ) video_cards_vesa? ( x11-drivers/xf86-video-vesa ) video_cards_via? ( x11-drivers/xf86-video-openchrome ) video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 SLOT=0
-_md5_=0f42db4465de78ee480f43afca98fd2f
+_md5_=1ed224c92215f29cea2189b02189482e
diff --git a/metadata/md5-cache/x11-base/xorg-x11-7.4-r3 b/metadata/md5-cache/x11-base/xorg-x11-7.4-r3
index 8de87469a8d3..237964aeb96d 100644
--- a/metadata/md5-cache/x11-base/xorg-x11-7.4-r3
+++ b/metadata/md5-cache/x11-base/xorg-x11-7.4-r3
@@ -4,8 +4,8 @@ DESCRIPTION=An X11 implementation maintained by the X.Org Foundation (meta packa
 EAPI=6
 HOMEPAGE=https://www.x.org/wiki/
 IUSE=+fonts
-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=x11-base/xorg-server[-minimal] x11-apps/appres x11-apps/bitmap x11-apps/iceauth x11-apps/luit >=x11-apps/mkfontscale-1.2.0 x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/x11perf x11-apps/xauth || ( x11-apps/xbacklight sys-power/acpilight ) x11-apps/xcmsdb x11-apps/xcursorgen x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xev x11-apps/xf86dga x11-apps/xgamma x11-apps/xhost x11-apps/xinput x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsclients x11-apps/xmodmap x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-misc/xbitmaps x11-themes/xcursor-themes x11-misc/makedepend x11-misc/util-macros fonts? ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-adobe-utopia-100dpi media-fonts/font-adobe-utopia-75dpi media-fonts/font-adobe-utopia-type1 media-fonts/font-alias media-fonts/font-arabic-misc media-fonts/font-bh-100dpi media-fonts/font-bh-75dpi media-fonts/font-bh-lucidatypewriter-100dpi media-fonts/font-bh-lucidatypewriter-75dpi media-fonts/font-bh-ttf media-fonts/font-bh-type1 media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc media-fonts/font-daewoo-misc media-fonts/font-dec-misc media-fonts/font-ibm-type1 media-fonts/font-isas-misc media-fonts/font-jis-misc media-fonts/font-micro-misc media-fonts/font-misc-cyrillic media-fonts/font-misc-ethiopic media-fonts/font-misc-meltho media-fonts/font-misc-misc media-fonts/font-mutt-misc media-fonts/font-schumacher-misc media-fonts/font-screen-cyrillic media-fonts/font-sony-misc media-fonts/font-sun-misc media-fonts/font-util media-fonts/font-winitzki-cyrillic media-fonts/font-xfree86-type1 media-fonts/font-alias media-fonts/font-util media-fonts/encodings )
 SLOT=0
-_md5_=58e5b2460b32132dba69ade8caef8346
+_md5_=5fada384302ff7e5729e20bca643540b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index d17c701b6be6..3dba3911da38 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/xf86-input-elographics-1.4.2 b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
index ecd16385c35c..7f653645fcf3 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=Elographics input driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-elographics
-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=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-elographics-1.4.2.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=02187c28cda0a1945f771bfcb6e1d049
+_md5_=dfb646dc02a7122aee21dd6df37e79e9
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
index 160596fb47d2..d0d8c62221c1 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Generic Linux input driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
 IUSE=kernel_linux
-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=MIT
 RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev virtual/libudev:= x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=992200e74d01a43ab7ca97c9e512bfb9
+_md5_=60fb5872a13a3d4f63054268d0357a11
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3 b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
index 77f64fe074e7..c998a4c26050 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
+++ b/metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.10 x11-base/xorg-proto >=app-portage/elt-patches
 DESCRIPTION=X.Org driver for joystick input devices
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-joystick
-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=>=x11-base/xorg-server-1.10 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=3758cf638ed675822e03b26bf6cecafe
+_md5_=34a76d00c3f91c51ec989b08dc2704f3
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
index b40da6dbb446..d5101f8168fd 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.30.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.org input driver based on libinput
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.30.0.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=303b8751f0f80e54c06ebfd3d05557e4
+_md5_=2ab8d8ed70f68f0754e1bb96c9c4052a
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1 b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
index 45480531b44d..f9739631e277 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
@@ -3,10 +3,10 @@ DEPEND=>=x11-base/xorg-server-1.9.99.1 >=app-portage/elt-patches-20170815 || ( >
 DESCRIPTION=null input driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-void
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=x11-base/xorg-server-1.9.99.1 x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-void-1.4.1.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=1a7e698e711abca6a687d07e97d716b4
+_md5_=3c48ceea99fb029ec9ee93039dce5e77
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
index 2a48a2759ab7..bff33e517eec 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org driver for dummy cards
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
 IUSE=dga
-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=MIT
 RDEPEND=>=x11-base/xorg-server-1.0.99 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	autotools-utils	961893b8004e6cf64fbef1cea6ed8bd2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=194cd73c4e3600565b61f958d0fff746
+_md5_=156cf11ae278c37714af1bc5189ceea1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
index 5070099e8ec7..5b2edad198e9 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
@@ -4,10 +4,10 @@ DEPEND=x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
 DESCRIPTION=video driver for framebuffer device
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
-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=MIT
 RDEPEND=x11-base/xorg-proto x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	5b0ceb032e8a8d1eefb9343124ed2c50
-_md5_=76ad749454cfa64916dd23c8bbb7e670
+_md5_=4f99888ca664c06432a1fb0201ae621a
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index a8f199743672..62ceba0146c2 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/gl2ps-1.4.2 b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
index 9a3e6acdb200..9f2bde08ebf2 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.4.2
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
@@ -5,10 +5,10 @@ DESCRIPTION=OpenGL to PostScript printing library
 EAPI=7
 HOMEPAGE=http://www.geuz.org/gl2ps/
 IUSE=doc png zlib
-KEYWORDS=~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.2.tgz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3716df1b838964842e0f4461f4d7ebc
+_md5_=c1d378f3cdb7ede3fc9a446ade05d20d
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 7a23aa896866..122934e1a890 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/i3status-2.13-r1 b/metadata/md5-cache/x11-misc/i3status-2.13-r1
new file mode 100644
index 000000000000..03fa94bd3aec
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/i3status-2.13-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=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 prepare
+DEPEND=>=dev-libs/yajl-2.0.2 dev-libs/confuse:= dev-libs/libnl:3 media-libs/alsa-lib pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) app-text/asciidoc app-text/xmlto
+DESCRIPTION=generates a status bar for dzen2, xmobar or similar
+EAPI=7
+HOMEPAGE=https://i3wm.org/i3status/
+IUSE=pulseaudio +filecaps
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/yajl-2.0.2 dev-libs/confuse:= dev-libs/libnl:3 media-libs/alsa-lib pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) ) filecaps? ( sys-libs/libcap )
+SLOT=0
+SRC_URI=https://i3wm.org/i3status/i3status-2.13.tar.bz2
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67e321ad482dc96e4c9870c0699e2a52
diff --git a/metadata/md5-cache/x11-misc/polybar-3.5.1 b/metadata/md5-cache/x11-misc/polybar-3.5.2
similarity index 96%
rename from metadata/md5-cache/x11-misc/polybar-3.5.1
rename to metadata/md5-cache/x11-misc/polybar-3.5.2
index f690f5dd9983..01a6f1b11058 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.5.1
+++ b/metadata/md5-cache/x11-misc/polybar-3.5.2
@@ -10,6 +10,6 @@ LICENSE=MIT
 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_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( x11-base/xcb-proto[python_targets_python3_6(-)] ) python_single_target_python3_7? ( x11-base/xcb-proto[python_targets_python3_7(-)] ) python_single_target_python3_8? ( x11-base/xcb-proto[python_targets_python3_8(-)] ) python_single_target_python3_9? ( x11-base/xcb-proto[python_targets_python3_9(-)] ) x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp:= || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-SRC_URI=https://github.com/polybar/polybar/archive/3.5.1.tar.gz -> polybar-3.5.1.tar.gz https://github.com/polybar/xpp/archive/044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz -> xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz https://github.com/polybar/i3ipcpp/archive/cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz -> i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz
+SRC_URI=https://github.com/polybar/polybar/archive/3.5.2.tar.gz -> polybar-3.5.2.tar.gz https://github.com/polybar/xpp/archive/044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz -> xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz https://github.com/polybar/i3ipcpp/archive/cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz -> i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad5eee42096b569d5199dd95fad7b820
diff --git a/metadata/md5-cache/x11-misc/rofi-1.6.1 b/metadata/md5-cache/x11-misc/rofi-1.6.1
new file mode 100644
index 000000000000..c6c19c7a452d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rofi-1.6.1
@@ -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=configure prepare
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-base/xorg-proto test? ( >=dev-libs/check-0.11 )
+DESCRIPTION=A window switcher, run dialog and dmenu replacement
+EAPI=7
+HOMEPAGE=https://github.com/davatorium/rofi
+IUSE=+drun test +windowmode
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype virtual/jpeg x11-libs/cairo[X,xcb(+)] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/davatorium/rofi/releases/download/1.6.1/rofi-1.6.1.tar.gz
+_eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0a99b2acb41724fc86587eeb85c35198
diff --git a/metadata/md5-cache/x11-misc/synergy-1.12.0 b/metadata/md5-cache/x11-misc/synergy-1.12.0
index d5775c69ac43..b40783b79d81 100644
--- a/metadata/md5-cache/x11-misc/synergy-1.12.0
+++ b/metadata/md5-cache/x11-misc/synergy-1.12.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symless/synergy-core/archive/v1.12.0-stable.tar.gz -> synergy-core-1.12.0-stable.tar.gz https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png test? ( https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz -> googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d49cf6efe68ec30a6fc8063adb4171bd
+_md5_=9481e0a7253cc900a75c24c2bfa5fb42
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index fbb44269a36e..ade9aa42c293 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/icewm-1.9.2 b/metadata/md5-cache/x11-wm/icewm-1.9.2
index 483d15349057..4cef5f487245 100644
--- a/metadata/md5-cache/x11-wm/icewm-1.9.2
+++ b/metadata/md5-cache/x11-wm/icewm-1.9.2
@@ -5,7 +5,7 @@ DESCRIPTION=Ice Window Manager with Themes
 EAPI=7
 HOMEPAGE=https://ice-wm.org/ https://github.com/ice-wm/icewm
 IUSE=+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libICE x11-libs/libSM x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr alsa? ( media-libs/alsa-lib media-libs/libsndfile[alsa] ) ao? ( media-libs/libao media-libs/libsndfile ) bidi? ( dev-libs/fribidi ) gdk-pixbuf? ( || ( ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) <x11-libs/gdk-pixbuf-2.42.0:2[X] ) ) !gdk-pixbuf? ( media-libs/libpng:0= virtual/jpeg ) xinerama? ( x11-libs/libXinerama )
 REQUIRED_USE=|| ( alsa ao )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ice-wm/icewm/releases/download/1.9.2/icewm-1.9.2.tar.lz
 _eclasses_=autotools	3ec5e49b810b2571ca9c6d76f55867bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=c2ba7b83bcff554275e3124a53458bf0
+_md5_=1d11ea14d6e274c48f00f22db93d64ff
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index ec025cec3fd8..576815ad8862 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/garcon-0.7.3 b/metadata/md5-cache/xfce-base/garcon-0.7.3
new file mode 100644
index 000000000000..391870284541
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/garcon-0.7.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig introspection? ( dev-libs/gobject-introspection )
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=Xfce's freedesktop.org specification compatible menu implementation library
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/xfce/exo/start
+IUSE=introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.50.0 >=x11-libs/gtk+-3.20:3 >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/libxfce4ui-4.15.7:=[introspection?] introspection? ( dev-libs/gobject-introspection:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/garcon/0.7/garcon-0.7.3.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b203132a3b2829ccf1ce2a5352625635
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.15.7 b/metadata/md5-cache/xfce-base/libxfce4ui-4.15.7
new file mode 100644
index 000000000000..6c2fcbf789df
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.15.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
+DESCRIPTION=Unified widget and session management libs for Xfce
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=debug glade introspection startup-notification system-info vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.15.6:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10 ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification ) system-info? ( dev-libs/libgudev gnome-base/libgtop >=media-libs/libepoxy-1.2 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4ui/4.15/libxfce4ui-4.15.7.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9dcac322d1dc1f7c0987490b38f036f1
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3e36dda02b58..e6f66711a3f6 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Dec 2020 10:08:32 +0000
+Tue, 15 Dec 2020 04:38:37 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3bc4410f2676..2c04af5d60f7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 14 10:08:32 AM UTC 2020
+Tue Dec 15 04:38:37 AM UTC 2020
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a7abbc774855..e3ee64bbecb2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Dec 2020 10:30:01 +0000
+Tue, 15 Dec 2020 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index edda6127d3bb..a46c1be78380 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-06572d76e2119c962282e71702902db1e0ba86fe 1607937656 2020-12-14T09:20:56+00:00
+1aa1f008296d4b2ed9805b3767e943c86fa5ea60 1608005624 2020-12-15T04:13:44+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 58fce6be1f4a..c31ff4ac3421 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1607940301 Mon 14 Dec 2020 10:05:01 AM UTC
+1608006901 Tue 15 Dec 2020 04:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3e36dda02b58..e6f66711a3f6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 14 Dec 2020 10:08:32 +0000
+Tue, 15 Dec 2020 04:38:37 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6aca37d5db6e..942e7347e349 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 31a22d69eb82..148254cc234d 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,3 +1 @@
-DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774
-DIST iptraf-ng-1.2.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10eacded15941545d8d7cee19c954aae2619c39a11b1eeaa79f5a381b5dcf2e6a6e0b8fdd7e78e75f41ab10b71e6a0a SHA512 6dc3b5deb7c6fb3776ce696492975db43c13fa2d1d956712e7738ef34ac1bfc5f5d63a5211ba8e9fabf391e8bc5560c08c5d5e219b0cfe067e3499b2c02e6f3d
 DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
deleted file mode 100644
index 3a2bcb201de4..000000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="doc"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	!net-analyzer/iptraf
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS/s:= -g -O2:+= :' \
-		-e '/^LDFLAGS =/d' \
-		-e 's|$(QUIET_[[:alpha:]]*)||g' \
-		Makefile || die
-	sed -i \
-		-e 's|IPTRAF|&-NG|g' \
-		-e 's|IPTraf|&-NG|g' \
-		-e 's|iptraf|&-ng|g' \
-		-e 's|rvnamed|&-ng|g' \
-		-e 's|RVNAMED|&-NG|g' \
-		src/*.8 || die
-
-	epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch
-}
-
-# configure does not do very much we do not already control
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC
-	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	default
-}
-
-src_install() {
-	dosbin {iptraf,rvnamed}-ng
-
-	doman src/*.8
-	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
-	use doc && dohtml -a gif,html,png -r Documentation/*
-
-	keepdir /var/{lib,log}/iptraf-ng #376157
-}
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild
deleted file mode 100644
index bda05a1a02a4..000000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng"
-SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.7-r7:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	!net-analyzer/iptraf
-"
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS/s:= -g -O2:+= :' \
-		-e '/^LDFLAGS =/d' \
-		-e 's|$(QUIET_[[:alpha:]]*)||g' \
-		Makefile || die
-	sed -i \
-		-e 's|IPTRAF|&-NG|g' \
-		-e 's|IPTraf|&-NG|g' \
-		-e 's|iptraf|&-ng|g' \
-		src/*.8 || die
-
-	default
-}
-
-src_configure() {
-	# The configure script does not do very much we do not already control
-	append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	tc-export CC
-}
-
-src_install() {
-	dosbin ${PN}
-
-	doman src/*.8
-	dodoc AUTHORS CHANGES* FAQ README*
-
-	if use doc; then
-		docinto html
-		dodoc -r Documentation/*
-	fi
-
-	keepdir /var/{lib,log}/iptraf-ng #376157
-}
diff --git a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
deleted file mode 100644
index e854b260252b..000000000000
--- a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
-OUI_FILE="OUI.list-${OUI_DATE}"
-HOMEPAGE="https://github.com/alobbs/macchanger"
-SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-caddr_t.patch )
-
-src_configure() {
-	# Shared data is installed below /lib, see Bug #57046
-	econf \
-		--bindir="${EPREFIX}/sbin" \
-		--datadir="${EPREFIX}/lib"
-}
-
-src_install() {
-	default
-
-	dodir /usr/bin
-	dosym /sbin/macchanger /usr/bin/macchanger
-	dosym /lib/macchanger /usr/share/macchanger
-}
diff --git a/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
deleted file mode 100644
index 009b018eb6e0..000000000000
--- a/net-analyzer/macchanger/macchanger-1.7.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
-OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source
-OUI_FILE="OUI.list-${OUI_DATE}"
-HOMEPAGE="https://github.com/alobbs/macchanger"
-SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm ppc sparc x86"
-SLOT="0"
-
-src_configure() {
-	# Shared data is installed below /lib, see Bug #57046
-	econf \
-		--bindir=/sbin \
-		--datadir=/lib
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	dodir /usr/bin
-	dosym /sbin/macchanger /usr/bin/macchanger
-	dosym /lib/macchanger /usr/share/macchanger
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
index 1ee76659bd70..d09f07e3fb76 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2728ff86217d..82559cb9aac2 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1 +1,2 @@
 DIST wireshark-3.4.0.tar.xz 32502760 BLAKE2B 5d8106f36cc3a1425fd472f7ba645b2a07bfb93c96178a98f90676f39cad38089b625d7d6725ecfaf67bfc78aba3476567b9bf390d6f0dd838537eb81bc4aaa7 SHA512 02070db23c64e1efe42b83cdcd7b52fb9b247e653da0aa12dc21a4283272fea0a135f4b0c5641197840bef88e52785d64a860c9fcfe1bcbaceb016c5258c9649
+DIST wireshark-3.4.1.tar.xz 32470004 BLAKE2B aa2c3e56df4232b087d09a52209eec1e91a10ab125f6fb973171771d86d349ddf76bef3da089f0d6740c67883009fb77c5760c1141c99a056e7a36fe8ae5c088 SHA512 a968158a5a22d04a9bf3b060246f7579210a8106e06184411fd00dad69e030c10aecfa579c09dcca11fb659e0a1de4773951578cb3697dd2dc8e5153d3892728
diff --git a/net-analyzer/wireshark/wireshark-3.4.1.ebuild b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
new file mode 100644
index 000000000000..341e4cf131a1
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+	+mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt
+	+randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl
+	sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	acct-group/pcap
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	ilbc? ( media-libs/libilbc )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	opus? ( media-libs/opus )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_ILBC=$(usex ilbc)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LTO=$(usex lto)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_OPUS=$(usex opus)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g pcap -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the pcap group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c3d9ba5c77b6..63a3ac297ee9 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/unbound/unbound-1.13.0-r1.ebuild b/net-dns/unbound/unbound-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..daaba00dd008
--- /dev/null
+++ b/net-dns/unbound/unbound-1.13.0-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+CDEPEND="acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	libressl? ( >=dev-libs/libressl-2.2.4:0[${MULTILIB_USEDEP}] )
+	!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	dnscrypt? ( dev-libs/libsodium[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		!libressl? ( dev-libs/openssl:0[-bindist] )
+	)
+	http2? ( net-libs/nghttp2 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)
+	systemd? ( sys-apps/systemd )"
+
+RDEPEND="${CDEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_enable ecdsa) \
+		$(use_enable ecs subnet) \
+		$(multilib_native_use_enable redis cachedb) \
+		$(use_enable static-libs static) \
+		$(use_enable systemd) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		$(use_with http2 libnghttp2) \
+		--disable-flto \
+		--disable-rpath \
+		--enable-event-api \
+		--enable-ipsecmod \
+		--enable-tfo-client \
+		--enable-tfo-server \
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit contrib/unbound.service
+	systemd_dounit contrib/unbound.socket
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [ $? -ne 0 ] ; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 141122e3c009..81937ba3c8ff 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild b/net-im/prosody/prosody-0.11.7-r100.ebuild
index 6c88fc7967ee..1afc7fa76fc2 100644
--- a/net-im/prosody/prosody-0.11.7-r100.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r100.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} )
-LUA_REQ_USE="deprecated"
+LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_REQ_USE="deprecated(+)"
 
 inherit lua-single systemd tmpfiles toolchain-funcs
 
@@ -69,6 +69,7 @@ src_configure() {
 		--idn-library="$(usex idn 'idn' 'icu')"
 		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		--linker="$(tc-getCC)"
+		--lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
 		--lua-version="$(ver_cut 1-2 $(lua_get_version))"
 		--no-example-certs
 		--ostype="linux"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9aebf6626fd1..06c2d42656dd 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index b508e930c3ea..eaa6c1a9a550 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1 +1,2 @@
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
+DIST libslirp-4.4.0.tar.gz 128453 BLAKE2B da747071c22522649627dd8b2e1cd621129a6898b2391d0da2a8f032068f129d11de3dc0e0f94ac38b36c79e2cc0c9508a3bd3e9a07beca914219146c82faec0 SHA512 27f5d41730a3070df4ead1af4ec42fdff141289e5072ec93053b9236d9197bc3f1a3a804c85eef08458ab47a0d4921457df57ece5aae42cab9f068ccda31f3ee
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
index 90da793ff230..e093b893bfc9 100644
--- a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
diff --git a/net-libs/libslirp/libslirp-4.4.0.ebuild b/net-libs/libslirp/libslirp-4.4.0.ebuild
new file mode 100644
index 000000000000..013229b4fd9c
--- /dev/null
+++ b/net-libs/libslirp/libslirp-4.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
+HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/glib:="
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	echo "${PV}" > .tarball-version || die
+	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+	)
+	meson_src_configure
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1b4a6459983c..3f1c1897c6bc 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index 0973aa512edd..7f108b8d46e9 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -75,10 +75,11 @@ src_configure() {
 		$(use_enable vala)
 	)
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 	gnome2_src_configure "${myconf[@]}"
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 1e50b9f22e50..347bb0a5d5f0 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -75,10 +75,11 @@ src_configure() {
 		$(use_enable vala)
 	)
 	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
 		myconf+=(
 			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
 		)
 	fi
 	gnome2_src_configure "${myconf[@]}"
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 8e14c045fb53..ec0add271002 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 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"
 IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 3a032f493168..78be0b0a1689 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,4 +1,4 @@
 DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec SHA512 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
+DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 6f49eba8f496..5d879286e9ff 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">bcpierce00/unison</remote-id>
+		<bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to>
+		<doc>https://github.com/bcpierce00/unison/wiki</doc>
+		<changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild
similarity index 91%
rename from net-misc/unison/unison-2.51.3_p20201024.ebuild
rename to net-misc/unison/unison-2.51.3_p20201127.ebuild
index 36616120b23c..f1758eeb5557 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 inherit desktop xdg-utils
 
-MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
+MY_COMMIT="4713e608d2f9c998ba4412fee53b94dc9bef98b9"
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
 SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
@@ -39,12 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
-	# build unison-manual.pdf but not .html
-	if use doc; then
-		local myconf="all docs HEVEA=false"
-	else
-		local myconf="all"
-	fi
+	local myconf="all"
 
 	if use threads; then
 		myconf="$myconf THREADS=true"
@@ -64,6 +59,11 @@ src_compile() {
 
 	# Discard cflags as it will try to pass them to ocamlc...
 	emake $myconf CFLAGS=""
+
+	if use doc; then
+		myconf="$myconf docs HEVEA=false"
+		emake $myconf CFLAGS=""
+	fi
 }
 
 src_test() {
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
deleted file mode 100644
index 6edc22e53535..000000000000
--- a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GENTOO_DEPEND_ON_PERL_SUBSLOT=no
-inherit eutils perl-module
-
-DESCRIPTION="Client for Wake-On-LAN"
-HOMEPAGE="http://gsd.di.uminho.pt/jpo/software/wakeonlan/"
-SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-ethers-lookup.patch
-	perl-module_src_prepare
-}
-
-src_install() {
-	perl-module_src_install
-	dodoc examples/lab001.wol
-}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index d7b0126856b4..47c2321fd33a 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index c1a240e5a10b..86c968af3456 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1 +1,2 @@
 DIST rssguard-3.5.9.tar.gz 5775322 BLAKE2B f7d91e87b2a55d780bc1eae4f7e55b8059c049d21998f4c2554a84ca1d7b283e3145a556eef77e784d88ae2ad9f016d7b486a12141dceeada69dd1240205de23 SHA512 3a7223767185bf37bef316291b88d60bb2906fdbd0b045aa07c2ca4be19aadaeaa0b8c923f22aaa3483c7db783386744ad1411ad1ab214a8a71ef260948707b9
+DIST rssguard-3.8.3.tar.gz 9865909 BLAKE2B 7afc9dd0cec9ff58164c341f8cb3c6f31608da958a9c64f8099d9ba645cf7bbdaaa76accb3877943eefeb71b9172a13fa43c0ced7d58c6f368cc164e40a5ab39 SHA512 d7c1d18981177880d93bfaf4a87769638804058609f68b8c42db376c4a0e56230b57a29f70054deb30e02634cfa64355ecfe658b5f961a516b990af91c6f3ba8
diff --git a/net-news/rssguard/rssguard-3.8.3.ebuild b/net-news/rssguard/rssguard-3.8.3.ebuild
new file mode 100644
index 000000000000..974794479bfa
--- /dev/null
+++ b/net-news/rssguard/rssguard-3.8.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Tiny RSS and Atom feed reader"
+HOMEPAGE="https://github.com/martinrotter/rssguard"
+SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug webengine"
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	ebegin 'Sedding pri/install.pri to install to $(get_libdir)'
+	if grep -q 'lib.path = $$quote($$PREFIX/lib/)' pri/install.pri; then
+		sed -i \
+			-e 's:lib.path = $$quote($$PREFIX/lib/):lib.path = $$quote($$PREFIX/'$(get_libdir)'/):' \
+			pri/install.pri || die
+		eend
+	else
+		eend 1
+		eerror 'grep for lib.path = $$quote($$PREFIX/lib/) failed'
+		die 'find out what changed and update the ebuild'
+	fi
+}
+
+src_configure() {
+	# CONFIG+=ltcg is needed because of https://github.com/martinrotter/rssguard/issues/156
+	eqmake5 \
+		CONFIG+=$(usex debug debug release) \
+		$(is-flagq -flto* && echo "CONFIG+=ltcg") \
+		USE_WEBENGINE=$(usex webengine true false) \
+		PREFIX="${EPREFIX}"/usr \
+		INSTALL_ROOT=.
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 51cfa2c10413..47c680f04ffc 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index d5cadaa9a5c4..31c9e74ab0be 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,2 +1,2 @@
 DIST airdcpp-webclient-2.10.0.tar.gz 963410 BLAKE2B 9cbc04d023d9478d48b177cfb457cdaff11a8079388078125ccecf5936cbac8e22aea3cddae9dd21b76b6d24d586ae4799bf2a8e67929d1134a2218a57aa9c3b SHA512 c80ec28198550846feda6d3dfd01ea0e0b402cab6753c1f7976df4bda0d8a8a2124d1ae7a437dbb15446665ec199decf897e49edd6aaf7f3983e7b7e7dc645e5
-DIST airdcpp-webclient-2.9.0.tar.gz 967670 BLAKE2B f10c4a44e724f178f55f79ca2a0711f29933a11112e18106bc12833d45971bb51867b00c6ef2a74f4c4eafaedbb7da47d7dcc97959d03794aeeb626ee727df4c SHA512 c0b6dc30aa5b2dbb40096b530c5cb7d5c46dc085b04e6277384d98ce9120988bd471a95995267def42323dafe0b99f760aba07f181d2211b27db20b31adad142
+DIST airdcpp-webclient-2.10.1.tar.gz 964433 BLAKE2B aa0db1c199e0546a35dddb7750ae9b2723afe09ab77a3ee17c02a1f592afc4075eab1017ea4114f07ee2e4d363aabfde510647f4e25569835312f120677cb1c6 SHA512 82a0ab406fa5861deea5be6a06682f2a756d3140ec85faf0cd1f9c5ddbae3a63acdad560f7196e7a25de0183e6647954ad7428fc327f81578a4b64a0e2ce088f
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.9.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1.ebuild
similarity index 96%
rename from net-p2p/airdcpp-webclient/airdcpp-webclient-2.9.0.ebuild
rename to net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1.ebuild
index acb5cd4995b0..1f5aa45d38d6 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.9.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit cmake python-any-r1 systemd
 
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1b367364afad..40824fe4b2c0 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index 4869f301fcda..c1be45e6658e 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -9,6 +9,8 @@ DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a75
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip 7096 BLAKE2B dd3436eacdcf42567210b68830f6a9663ed91531d73aa6c2548f50e387d7081a0908478135816a599014a82e23fd6ca9c2685ce8518c6ca73bce24a9f0ff5f6d SHA512 6111f8ea08657e90dce1ae450736cbc3a6e10cd61ee5211ef4cbb1abe1862d0fa658ef2922b6778084d10af3f3c55744962162bf9fbdf48d2c42f6a15b297ea2
+DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.mod 36 BLAKE2B 63449f57a292772e178e1064008cd63f520a7cf20095c51ef6ff88075129828019e66734f79b6a0b81c0873b0ddce10d941f62c7b9951f716ccb251967201087 SHA512 be9b456cad78b6194afa1fa9d6df1a77331706d03102e092a36d7efaa19a9d708fc72245ad224ea1cd87ccd59087b6024f949176aa76e4547f6bd9e7f98231f1
+DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180613141037-e580b900e9f5.zip 32613 BLAKE2B 4bccac5a9960e762e72ae9cbcf0e58ccae706c9f87c9d6b44a4400ed2d30f3c720e44524ad0a43a59b7bc006cf1a7d181a1740970d50b89d94629f4d9f3e8b65 SHA512 b8744366644027071282598b9507654b17ef5fd913f9a9c090fba87ff379e10a2a9fa267900866b7624c404ff421af511c8d0acdf0100dd48315da91256872ed
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip 5273 BLAKE2B fd47f46372a66797bb7028a856f903e9768589b550f869b80cb271fc6ae602f57fed7a296cac6ca14d668d4220f2c3f9f6e6e67bf23801ceed6b2b8e3c8a4494 SHA512 7002be4436a93e90cf69cdf16b92d93b4651e3f18bbae099c3780c6b8abc24363044807dcda3d943c0d6f6fb5f428effeea6a3b8e456eb151b072edf5f4fbfed
 DIST github.com%2Fapenwarr%2Ffixconsole%2F@v%2Fv0.0.0-20191012055117-5a9f6489cc29.mod 173 BLAKE2B 55f6edb4ed556fcda68fbbdb04bdf196a6b377cae10f274c3ecfaa74e4202e8cd6c3f6f77a480c42934a9f30217141d0f7297dc736230fe1333198b62e6882a1 SHA512 75ff35bbcbd227f0bf6c55a94580c6c19a6e1507886ff3cafd320ffd9ffeb5f76b37669ced4b676baf528ebdfac20e4a12e727b332e08f0b08dacdddcfdffc48
@@ -28,8 +30,12 @@ DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip 9718 BLAKE2B 1e0c02ef1bd74bd1ee2b8eb2752428274657d31781042fb3fd14c6c1a9acf15d64a427b08fed6cd34f39de28e44f23cce4bb330dbeac1a8e6ca98598c463a748 SHA512 d7b49daaa77088d1fcc932e1a3cbb2e85302e6b3e486657468396e407fadb69b28763cf5811c0c1c60a8f02033de2488035b020a0d2aecabc75364526b429e46
 DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.zip 32647 BLAKE2B 410ad54c733b42b4a0c0f3b64aadea79db9710ec2691882889f66c3c4be87227560c1f3266d955d8753989482d86077f5e316b0fc25331a6feb38e43f1142452 SHA512 d1d185c62f46701abbb17730a510093ed72e20f663f23ecaa918f11822afb9428c87f1acb24b895705ec38db957a99e1af2f3683de3e8bcdba86f29319617499
+DIST github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.mod 43 BLAKE2B 95fbabbc322d20a2cde22af12605300884baa7007f51a63838aa2e5c604c3917a13be94c907065a6b67a6a9a163a1d025c8eaae4505bd1fa662b7f8f1a4ed2c7 SHA512 2abe39e773c7ca354a4b07e8933136bd535981cd8f2ab2617e2480afafb537dbf587ac9d731fc0ac3b3f2dc66dcd3170c0d4ef0a10326cf515909b2ac9294a1a
+DIST github.com%2Fgo-multierror%2Fmultierror%2F@v%2Fv1.0.2.zip 4330 BLAKE2B 5783fbb762959bf72e56d7416c6add49ab62b90037b83907b3d11b2294aaffe8f401659a0067bb23b6c7dcbfbec1007a94e99dd631d76c3165222602db254b54 SHA512 66f2bbac58f4d41714baa0fcffa18422f685a132d454fc2c83f163bf1f674f6788794a65742ec5b7e18fcaa85711c1529d6187b52338461ec1cf96926825f3d4
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b
+DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.zip 91628 BLAKE2B 740176e3d836aea1d048b055add89c2da65bacf5ff93315a62d33a82bce287dbf041376711f0464eba8e71396f12e411d867e719d340c65d790948a17bab9779 SHA512 14f8d0a81caf385c26ef681e16e4045bfa0f5f08d90d68de22f17d6f462c592442a78d24391f7ea3b6e44e8a035b065d00d72dc34a72c50fdba85cecd118b63e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -38,6 +44,7 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.mod 219 BLAKE2B ab8e45112351fe2aa594f8f731c1143df4968325b27261dd448d76abf79322cc2a09ec59b566ff23a3df43f43e29099c03e14e3ddf6488d54f273e0fdb4f2335 SHA512 adbc2847756f54e409ff819dd33a1fcd3d5e4ca9f91a086526123d4396d337a884d6dece83960442b21359b978e7e66335a85e2187d62abe1195e5850f3daa25
 DIST github.com%2Fgoogle%2Frpmpack%2F@v%2Fv0.0.0-20191226140753-aa36bfddb3a0.zip 38525 BLAKE2B 3adce942a4220a371b1fb6c554e5b3004bc295f18187bc92e4f94c3f3fed108ba61274fda80a7cf2ca46a50c23d3c67e7621d89e8dc6510a4f6c74b8ad093ef4 SHA512 6222b774d20563bacfdbe1524bc3f8bd61e595e8e210ba220c4094c5106f3533bff4528c8e7acc2cea4841da9c4391721f47e7a858cc114e6f40f97498e27eb6
 DIST github.com%2Fgoreleaser%2Fnfpm%2F@v%2Fv1.1.10.mod 1016 BLAKE2B 3992779cfe64a44f178c16741819d9059857050f83aa974dc8051ba4a687369ccf035e1314469c03fa8a8c900343ac456beb987dd7d2a7c1cc16979877d47a2f SHA512 4834227885debdf881a8b0505206553c9b18c050e52fd208ee92e8fefa3aadc1ded68d55ddc640af3bb85c8da5b7f0f154b8a88c08b85a22f377c754d3697fbb
@@ -47,6 +54,9 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a
 DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip 244042 BLAKE2B faa111681131e76d0e5f2a1f667705cde703918b229e031bb20b7e7e8eb397500d27de90cc61b968849d436a1ba392cf6b9290f41572cafc3a17f4554eb60f6a SHA512 350c63f32591be74831e8d5d671366ef4b81ed73863b084c6eb63a4f98ce811290738909ef3a0d73429a187172a1f6c2983b187092c12f5ed68cd05ba6a306a1
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.10.zip 18201824 BLAKE2B 45f998244e394f0b8b10d8f8b56771ba027e424cbc357d6cfddd290080f4e6acb6b646e208224d575dbe8f9417b65cbf10e1e306867e1dbe8e2cdb29cbdfd452 SHA512 ab19cb9f8a20d2a32abdbc07392e3142a572eb85b3279715d392ee2baaf3bc7b97e121cee754db502f073727249cfba1b235dd2f1fb435de62a68b820f42c583
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip 16194359 BLAKE2B da3b081970f666c910de17fb8f959d1c52e7d92b64973b98954b816aef77629014d00eac2a064cbd32b4d4f40581cad8ffd37861c33fa8df31348cd21b320807 SHA512 2157dbd3094aaf49f560c066c6a84314141964ca72425187ff0647f03a033b33234530027879df08055dbff9d58ae365f467f5c1572d33cf0bce1edbe3910e16
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
@@ -55,12 +65,16 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.zip 14199 BLAKE2B b9bb1dffef78db4dcaef4486c1a9d6b5977cda3b4e33e7ae585a72deaae1e2dbcf37eda3fe15917ae3e2879c04b1dad2699d363e87fe92ede94b36e06ccb90cc SHA512 1c5bd671c28d8ef4fec6e870899a41c4abaad744e558eb4dc167235e14c9baa685f0e3eb31c0dcec2f638f162109c99c3a52bbd0ed0a704afd3a4d010fcb17b7
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Flxn%2Fwalk%2F@v%2Fv0.0.0-20191128110447-55ccb3a9f5c1.mod 27 BLAKE2B 368c43817afe890ec61cfb738f0f5a581fe3408482c47af72e77d83c3da11d8b47e537ba776c8304eed0684db8ff9dd7f5ab9e36130b3e4b28714c0d3764fdf5 SHA512 d8790a7e63be36bada6ccd06e63378669bc5492841da9bd1eb52e77eab2d76affc3080ffbfdf1a2e9c5a6263b5de8a5ad790032399cb084826398b930965a2c8
+DIST github.com%2Flxn%2Fwin%2F@v%2Fv0.0.0-20191128105842-2da648fda5b4.mod 96 BLAKE2B 91c8ec7d947ed483830f0347b359eff1b1198fb537732d76966a1264ed63366be9d4ada0b9e22ef6e7bb05b1af6e63342305b8f75f10261931c3f871059f1fdd SHA512 6d66838befea66dfd964bcafe2719c74b6f51bf0a287b4fdd4d80c523229e57c3f42921645868c07972899fc0628bb015684500c4499b3c948238e09f1fc4ce6
 DIST github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.mod 33 BLAKE2B 1b3613d2a34c4d25694fa94356e3bcf622b385518ca02d586ed42eae5844b1902124f2fd22d6e7974b584c5b92504b3a003904cb989792827977f63835df2729 SHA512 036860f698203a0c3d9e64a488acfa6ab3f879cdc7ac792ae67c1d10c1272ccc9a98723375dd2ad9b16f5f315f33618c5a28537ac7ffa0b74ecf19e9cf7df22b
 DIST github.com%2Fmattn%2Fgo-zglob%2F@v%2Fv0.0.1.zip 11274 BLAKE2B 95f4839d952e6cfd91c56588a325e378a3fd1e7889a54f632f48fb187f14956382f597d27f3be1f255a0c76ceaacb7ccebca217545f1a6e1f8bd0b0288a65f60 SHA512 8785be0ee43b2a62a2259e7e6a8468f7e7742223afd206e5cf826ac8fde0cd08c7fbc31273cc39a8f40dffcb2452e0497ba1a83f752b42f798f044d3a8f3559c
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod 264 BLAKE2B afcb7c0ee7467a383178aed08ff780382ee1efbda1101cd944cba4dd653974153654b3ff38943fb7d6ecece515997384e8eb6f9be2aaceaa4b09bec6fbfddfe7 SHA512 e59cba812a94c451a95be9347f148f0341d0803f32f5f387f6b9dafc96bd4072b035e6fc504235554585338ef448304fcefbc50b1b345d80b27f1cc1b2b571b2
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod 264 BLAKE2B ac83365044a3a4cf949e88ebfa21128e7af58e00b1681d94165dccbd57c8cbc45079b84d0da814312f60baeb0bc8209a66f5edbc6c9b376ed2068ae167f35eff SHA512 18c6cda418f62c68b1f39b3d40ae8f6a81442f577bf8eb3180df408c0ed9e05e4f43b57d0bc54f4d51b1c13d8fbb436f01895c3a3c70ce08d7d47ebca1e46726
 DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip 74437 BLAKE2B 2be63a0aa702e9058b30dd748b107531f4eff9d45f75e9c19f9201fb004459f000068680e087de25dae41e078a635583748d57a7e8ca61d11a371b92a34b823e SHA512 6352cd230bd13320273b41b39e2b7b8736a8a51149772e20a1656b83081112663ad8a9143a2507fac52114aa44afe391ab4302f6b2541b014e2f4e2784a4a640
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip 220586 BLAKE2B 278d2b04a115fd65be0ef9dfa583cd587b5006133599e17051f0d2632cd50503f764cf9ff614073ccf68bbd5dacb37621c99c4b2b4fc001cb56a650333540b26 SHA512 965b002270ba1938a9dd81ca88a290658514a93f400105f158374950abe7e14342980a42829151316d955222e92de0232dae7ad0a7baad88a055cc52957a987e
 DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
 DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.zip 46807 BLAKE2B a64df07253a82c3565832a2b5e3d7f22cde608ae4d3f8bd29e8f2533a13c0e70c8ef6e163ee3b59fbf1cc82319f55535b4363d92211deab821d5916766062515 SHA512 ddf3a602fcc157fb1f469883b43474e758464aba1fee84d5ec81b222926cfc2544adcb690b041a4152fc7775b10b3a612de06ddf58c936d62b029f07727acc03
 DIST github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.mod 33 BLAKE2B 00f9f8e688d302c27f668e5d5f943b1cc058e090d7e2d32e70d56a9782f7cb3c62a4dc399d3cf97321a07702d3fdf170dec82175b8f0af3865fa3e261d982772 SHA512 20529318383fec61da3ad57a44f1b1d21011b6db36d5f04ba7ef7008a722724a09bda8d706166620ca3e346cd42c295b1c698d650d5549bef8173546288702d7
@@ -68,15 +82,22 @@ DIST github.com%2Fpborman%2Fgetopt%2F@v%2Fv0.0.0-20190409184431-ee0cd42419d3.zip
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
 DIST github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.mod 121 BLAKE2B 966d061afdf45fbbbaba91ef8ac10e8f85433f748f2d4acff110af109bdc2c4bd85d2b2be77e5e9d64554a16159d94cedab361580a30745f9740fc8fc8552232 SHA512 24818af44d1190c0dfac9e6c027a59cde2d1eca023ce962b9b80b1807e0d12e420ad56bbbc44d2cfbfe2455de2177bc75e1a44ec107cdfeaa6596f8967b9297c
 DIST github.com%2Fpeterbourgon%2Fff%2Fv2%2F@v%2Fv2.0.0.zip 42057 BLAKE2B 05bcf9e88d579650d38a41b234c973bc7cdc8fe91f83ef8650d7cb0409fa5a685cb10d71d1360e8e445bc93ff6bb4a174ec27b67ff6f8700b9bd93404ec5639a SHA512 f68806718adf41c9e3300879f4519c0f017df9461c755f1d3a89c1521c9b6eff1c6bdf46bbc4f4122b36edf5459991777ef9f002a904b02934d2fdebfd238e95
+DIST github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.mod 130 BLAKE2B cd8d7eea7f9c3589fe4d467a131e4b0df9fdd94e11f6f1c05455a53b2c4d3d6178a897cff8f95a58985d80d5166866a34308e2e678402c2841dee93eb80ce9c0 SHA512 27f1d5b6eb90748421a4f2d2cd92e433527099fb7906bda1d1017fdc0a2503c8e10eef7436295e12a72fb61c57a00e10afcf6d75e43ad0e3cef76c9d3701de54
+DIST github.com%2Fpkg%2Fdiff%2F@v%2Fv0.0.0-20200914180035-5b29258ca4f7.zip 220158 BLAKE2B 8df92ef97c8d1c511cf06b385acd96cfd456c5756c6720e4a2b5a7666eeaf398c6b1c223f5b3de8bbb873079f52c8119ed023bfc07e7ec1c241d37d1f2dc4239 SHA512 2f5c4bcf6180d0909bda103e18375b5b193708ebcb6310f14e359df3e0c2a7a08be4328d81bb254e5f0d200f69244e454dc9f86c28d4d1409040fce1950cd536
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.mod 42 BLAKE2B 9e4031ac381b68e3952feeefc4919bf072f08d0fc0d815c43d3546f1405cd0d3fd439600dd9357cfcd38e2818d2fc526369cd5b393bfe7cc42d5041e67f4b8c8 SHA512 f45442b35464e13a4f02d7c7ba5aa2ba37c2af1ca61a1016db01136c2aa66ad22fe068f2c2943766365c9d30895e4eb9c0ecf4128e4850bc4843998468dab6fe
 DIST github.com%2Fsassoftware%2Fgo-rpmutils%2F@v%2Fv0.0.0-20190420191620-a8f1baeba37b.zip 50122 BLAKE2B bd6d942c40860539dfb19ca1fbca2a9e45fd54e5a965847f9eb1159eb625a86f4057abf4250b304e914795e203c07ee9b0b874924108d75f832de2842d0de622 SHA512 dbb67c527015ea2b4778f59fa68fc82803110af5986ef13179c08adf66e956247c489792d00a8a23453671805e97c8b651302dc3133e08dc6c9d22ed6dc17db8
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.mod 170 BLAKE2B 5c0ae84be03ec84d3138e03db58bb0c6a4ba29b10e876df577a3e7a00e2645c5e9d995c3178219156a01a3db19ec8b934f50ad6c0feb1023bd1f34b29b3f7363 SHA512 ad330626b5147e85f6fcc38e1a90e71d2959d84905ea824835c3f66949c5c8d88f842703d47f941f1208b589e62d1c6f81bfcc6480a41e5a80e5947b0bf07c7c
+DIST github.com%2Ftailscale%2Fdepaware%2F@v%2Fv0.0.0-20201003033024-5d95aab075be.zip 10183 BLAKE2B dd6b7dc1eafe0fee5050f511c962bce3f81fb4e1e89a251a546cef57cc11c1cc637ab48d5c2528ed0b5f7dbc6c70cc35326c40a213f0d6b47558b4eaaa76d669 SHA512 77e0f62287e89ed3a39e705076866dd5049ba25d92dd237e5851adbe0032c86369f1b73e9e6e27ce7625c89a0e84d3c80bb62372cb219b9fbf63247ef8f3ea08
 DIST github.com%2Ftailscale%2Fwinipcfg-go%2F@v%2Fv0.0.0-20200213045944-185b07f8233f.mod 110 BLAKE2B 84b26c2bd03c421ce151acea1253d734374ebe0098fd8b80b5fbf8cf374c796e8ff2d783fa1dd9d6e84db0983b7356d625c9cdaff6e8be48ba0c83ef38bae4e0 SHA512 0369612361b7ef4f6726e92e91e51b12b32f198a7466add8ffe518aec2b47dd998f379ba821298e917e0c3e30225bf30b0c6698c4adbac6e8c3ac810250cf21e
 DIST github.com%2Ftailscale%2Fwinipcfg-go%2F@v%2Fv0.0.0-20200213045944-185b07f8233f.zip 129500 BLAKE2B 2dd1db3286f48fd45f33a056704b69829dd0c9e3068874725f1167d338746854b4bf62e46c2a7e76f90419c2813d329627b702bfe6d76da59278ce9e9d730d05 SHA512 cb222ee00f4b99ddf3b4c540fe2f9b95e4531a1724b6426903d01061ff6999bca915b9eb4f4106d612dd5dc2f22bd5cd35a3eea40250f4d2c07eee21e52b3953
 DIST github.com%2Ftailscale%2Fwinipcfg-go%2F@v%2Fv0.0.0-20200413171540-609dcf2df55f.mod 110 BLAKE2B 84b26c2bd03c421ce151acea1253d734374ebe0098fd8b80b5fbf8cf374c796e8ff2d783fa1dd9d6e84db0983b7356d625c9cdaff6e8be48ba0c83ef38bae4e0 SHA512 0369612361b7ef4f6726e92e91e51b12b32f198a7466add8ffe518aec2b47dd998f379ba821298e917e0c3e30225bf30b0c6698c4adbac6e8c3ac810250cf21e
@@ -85,35 +106,66 @@ DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200407164751-7f0c43dd
 DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200407164751-7f0c43dd1145.zip 180084 BLAKE2B e94bf55811135cbf8a0e6c8599c6af76c40e8b9bd14e8b105f56479d934c791165c77878250bc3202b1de839c351c2dba85268b8a28962b8836f43592547c1a6 SHA512 3a3514e040647f43d67ccb0cadc3a24dbe178a3418b8b2e25389e1d473195fd380f0491207b09dd79354bf934013cb8e6096ea85b8769f7d5b6d6a71065fe4e3
 DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200416194755-23aababa2084.mod 251 BLAKE2B 398efca1382bbc91dba716c0eabefca99700582d23265a56b13d7667aedd2ce0d6328d4ee33ff584169028643f2b15bee530193e3bafd289da1c81127900e2bc SHA512 9ff2f90c97d1ff2d888786478bf991bdb96dd40e7e1c2ffd6d61b414ea9b19f88257d73bb1e5cfef92c1d7e672b13df05afda36f0a427a34ffdb25f89b39c474
 DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200416194755-23aababa2084.zip 180388 BLAKE2B 5f26ad1634dedb1b779fa6637c16404fdacc740527fe4e2d2d2112c9f39018ac80be0096b01440e92bc98cb5383755a393854a2a2b0d317fd35635e205c1d6fb SHA512 3de78ff9e5aaaa7b13cf36f0c3b34680689fea3bd20f9182e68249bdad1ce155a506d1241316a58a6e0553f59b4cb975364ddff169d043cc76ac3eed5fff39ce
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.mod 251 BLAKE2B ea66296771eb548ae54b65e58c57c2a013e986f3eec030b268f6190929e15a6eb69c3e620773602d17c25e329f3884d6b848e188c2eb68dd95eb3f54b41fce48 SHA512 352a757d0f1851287a372224e41df68c3486110162f71c7eb498e11340e3f076be11c22b12659176d2fc75bb556afbf9f8bd66c480f028825c8d5fd7ee8e8909
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20200921221757-11a958a67bdd.zip 180615 BLAKE2B 27d54bbba2fd9e03acc526fec95d53aeb5504c56fb575b8d6343cfefbdff1d9d4ddc17e1950e6c612c8ca8dee8934c4436aa7c76bca86e790d099a4abb08d6dc SHA512 4f634c73fc14cfc3084eb3df9bbb5ed5016e95bf100479c9bcf0b74fdf07e7bb5fc4701c25126e3ed8c4c8cae96679f2b2bbe8d51f62e7bb057490cf8cbb8123
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.mod 251 BLAKE2B ea66296771eb548ae54b65e58c57c2a013e986f3eec030b268f6190929e15a6eb69c3e620773602d17c25e329f3884d6b848e188c2eb68dd95eb3f54b41fce48 SHA512 352a757d0f1851287a372224e41df68c3486110162f71c7eb498e11340e3f076be11c22b12659176d2fc75bb556afbf9f8bd66c480f028825c8d5fd7ee8e8909
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201008164108-2c83f43a9859.zip 180727 BLAKE2B 3387f7ce86f00b3fffbab7e588acce3013873788cf9274998f31c712c4594df1543afe5cfcec2332f2bb2a5c58c057f1795f3fcef4ae54795f3e0a28275f4eb9 SHA512 167dc2c4c6cb300f4dcbf262ca827a129465037854688a7901a363a8dd05706edf0bafad2dcaed373160ff39dc5a4cf2b137961a0a5d0248a25a1b9c415cc96d
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.mod 251 BLAKE2B ea66296771eb548ae54b65e58c57c2a013e986f3eec030b268f6190929e15a6eb69c3e620773602d17c25e329f3884d6b848e188c2eb68dd95eb3f54b41fce48 SHA512 352a757d0f1851287a372224e41df68c3486110162f71c7eb498e11340e3f076be11c22b12659176d2fc75bb556afbf9f8bd66c480f028825c8d5fd7ee8e8909
+DIST github.com%2Ftailscale%2Fwireguard-go%2F@v%2Fv0.0.0-20201021041318-a6168fd06b3f.zip 180708 BLAKE2B 5b9b7690335d504d8b0875361751c76bdb2eb15af0443fcdd90637ffe17700d8ea53e514b5dd0ab39bc2fcb6465507c03f283a79c07c0118f347b17518ffd0ca SHA512 7c3cc37fb3c750c738325a4c81b05dbf1b19bedfe3f3d791ab8cf972e4bc37a6ff0b192f2dedff74684cb358439faabd703219043fcdc02ecd5f7510f47773c5
+DIST github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.mod 37 BLAKE2B 4bbce323d56724480e471710a9d2e2aadc997438c1082b6d3f721ce94e5e0b18e9191a88c9677c7c85b274bedf1b976900a0453ae9f053a1758f37cdaa6ccfa8 SHA512 1070c3376d361e01c040b62f78e316ee0342d09e526b33ff8c4cc3cca0b0800d2f13027662744ef75f331b2c526d6e8030036bed90bc760e20a2ecf99aa58e53
+DIST github.com%2Ftcnksm%2Fgo-httpstat%2F@v%2Fv0.2.0.zip 9174 BLAKE2B 1b366a8d956c9e84e1b14f986d07ceaf4bd0d7351bd7f5dcadf15f30a0f4071bc61869ee78197b78e5ef35e630c2f48bcca1e298e3fb4e01bbdec8786a10576b SHA512 d01a91b515ce00b57d475655322ddbe3d3455a4e3666234850309814dc7f2d52b706e862637790beaf1f9309868cb3d9d27440646b45182cdae2782c5b464e33
 DIST github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.mod 48 BLAKE2B f219e749e1ec15f9978fa1d812a25860f1d847ffae6a7e575e63329c2cf1aaff70d15f2e8f7a526342df1b143e2f8dadbb30b5c11a77031f40bf0169c5aac9a2 SHA512 6f6e1d16d25a421a7ef1604f4bf46e1e276bb12ab391e1c2647559794b6195c378396772fa677740b9434ebbbf7e425a69e8a9d3a7ea67c72222ac8860b86bd7
 DIST github.com%2Ftoqueteos%2Fwebbrowser%2F@v%2Fv1.2.0.zip 4418 BLAKE2B ac4362d686aff64ee18b90ad73af9d38e9ea6f8e8ad726a4acc00c4658cf2eb889bad89c3995c620040e2c4cfa55a091cf9f9098bc11796cdf2e4b572798d0e1 SHA512 ae17bfec038ca29f4a90940ceea68451e1d6787fdf99dde87ca36bfa6bd08b35578451e5e4b17f29593a2d33be18048b0ebe7428684b820306d46f44c066bc71
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip 509178 BLAKE2B 28a9600f1f26be089d65e264b2cdaf73bb2c0971b2e702ae31f130543c2b81cbbe93ef3f1593ced77394dcce5c1f5dbd8388cc5402c7d0d0a3fe38fbe8b63903 SHA512 1db053fc95051f1481b88b367cf4843137f0d23c6a0c3d350b52a7393319fb2c68a2fcc785d88d79f4128def271d2e3e51ec80a6fe7486af5f5e48b8b07c17cb
 DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod 25 BLAKE2B 21e5b310a30482f79ce878f1649fa49b3d1b34db022063882a89a83e18e58db00042a2dc35005a715f1d75a3cb8fe72dc3637a91649946f2205582aad092a1fe SHA512 5b8492ae7974c4282c5302607f891aeb4f49dbc4c04bc492f99edd9e9cf89e4f6a37f52a0897ec28440cd2aa1c91ebd8e10075eae4156ea574f7ff4363845e74
 DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.zip 1160500 BLAKE2B 46b1750b12455d7b557967ed61108117728992b2183cbf853c4a2c7ac9c2b844eea78892e0be4c455a99b03249991abab963434736e6b10714c871257ffb3c6b SHA512 05477018a6c6150018f99bc7688127f6420ba679c2fdf0d18025c9a43489975721ca9a10b1d99bc7e8f85c304c682acdb6856330c976523eb83c27b723510019
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST go4.org%2Fmem%2F@v%2Fv0.0.0-20200411205429-f77f31c81751.mod 28 BLAKE2B 889f4053ee5b7bf8e4cede9b5e5ac8e8b8e567f8711945226aa439524bb57d7ade76d690c9e2e35c1c67878f0d5fdac731d14c25a916b1e99f460ced0611ea42 SHA512 23ad46c7d9d2ff36c8a1f533b0bde4e1bbc6adcee80db3c122993a47a70280d8e8baabb7717e4a76b050e4cb8979cb70de5bcbd03666d5386041ab828a05e32d
 DIST go4.org%2Fmem%2F@v%2Fv0.0.0-20200411205429-f77f31c81751.zip 7199 BLAKE2B 6ab8bcd1455b0255c2f65b84cc9fe1011b88e048fec6b681ead471dccc03922bdf09e9fc789b569adc373ea0d2a6c6ec1e28d64e9baeb9c14262c1941b850aa4 SHA512 24189ea663641963f338a6a52f7e916cab61b28ae5ce6f19d1a4c2970753198799014808809f8a28b8e2a8ba0e9dd759c687839d6996810538bb1f20568dad31
+DIST go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.mod 28 BLAKE2B 889f4053ee5b7bf8e4cede9b5e5ac8e8b8e567f8711945226aa439524bb57d7ade76d690c9e2e35c1c67878f0d5fdac731d14c25a916b1e99f460ced0611ea42 SHA512 23ad46c7d9d2ff36c8a1f533b0bde4e1bbc6adcee80db3c122993a47a70280d8e8baabb7717e4a76b050e4cb8979cb70de5bcbd03666d5386041ab828a05e32d
+DIST go4.org%2Fmem%2F@v%2Fv0.0.0-20200706164138-185c595c3ecc.zip 13706 BLAKE2B f7c96ada11161c5e414eb2e82e54db60cf5889904fbfe90072b1584b12369d577f79452b9c8e89180d2393e523a40809f296e0421399711462738d8c210bafe4 SHA512 fce6fcc40d4541a3de1dac39fa9c158b39d080985aa38868b393f76fedbf4daf1d4541b00adc965939e48830ccc058e6107b8c3a4a300cc3e19ebcf1b880ad84
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200317142112-1b76d66859c6.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200317142112-1b76d66859c6.zip 1871718 BLAKE2B 7e5ef677963f44018b74c14921f2c89a39123285bda99876892419c2895b9e3cf12bf3ef1bcb839aeb7f533d26fdad5755b2b56eae2a4915963fbe9ff5399b2e SHA512 c6178c94ce8da1ad2c5b7dc42a0dd9cbd398f640a0a0a9365a05a806711cea6125df537dd4be8f95054fca44d289c5a52235a9d735fed344fbf9a6f9710cc2d2
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200429183012-4b2356b1ed79.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip 1876217 BLAKE2B 6ccbf46dcc9a97f60214af41470bc123c8b48a46737792d063ed6db50e937fdb87223032ff8f3c4d3f5ad0542a63e230ef70fa79ce681ab1ce71431b8a40caad SHA512 4795794202014a02396ae6e774ac5d9882d50c928660424f90798d806b1b5fd69f59e2bb23c5bf12a5841787cbc2f38142104b4427358dd527e539201415b35c
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip 1504684 BLAKE2B 988de9602740660bd9c8484f9413e65219eae6a8f906c0f0450443abeb8808aece8644957e8a405284e7fd1ee234d48318751db72ee825050f78b3fa13307f58 SHA512 9026af554df3cd3bc570a3a521a29007f906a1523852619f7e8e1d1b2e3504bb60e40bdefa5a003a8eb32da4a9dc98ebc4e6ca615fe87ca4269b7b3351414a56
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 24746 BLAKE2B 743f3b4641f002cdfec6805ead87d196b43a4de1ec59c788f8516f4bc78ef2d58fc8f0cc34a52e8762f39f0845470dfe4e50f269036576d021d65a5f30aaf08a SHA512 f7622fbf44dcdf894cd397edc8399e38b734cdfc6a6ef4f8e81af9408c9d912a1b96544e713c42237fb3116e70678755e829da8f5f628bc1cbf6767921cd380e
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip 27028 BLAKE2B 1148f5197f3701698ea33c6185b918fdada2b3f55d401dfb90d33731dfe80b53bfdd891df3c4fa572606cd88963de20d9b44f5296946d80aa0daedbdf6b658a7 SHA512 a93111e63671ef38bdf0ae2bd9209d6b3d7dc9ad138077d3bc22dad12f0657982667b7e88fc9a4162b0f6765184172957b05797a29a2d614c975df00b12c4aba
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190310054646-10058d7d4faa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -121,31 +173,58 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200317113312-5766fd39f98d.zip 1468561 BLAKE2B 2439b988a8d14ed7c9fb17b9788445fee3e8fbef396570fab1fa143b8acdddadb25b8ddcb78535ca7192640760015a1200ac283d6a0889f2a6205c5259146ed6 SHA512 36965c9b10a87f9f6df436e8a584b8a24f9c88c3fca247cde6f83cd63ea4cb483ae4043f827750c121e55ccb6a8b66329b2c2ae928ff71778175ef19ca992c9a
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501145240-bc7a7d42d5c3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200812155832-6a926be9bd1d.zip 1484365 BLAKE2B 4e3eb765a1f9e6f8ce71bfd87101784fecb69141616d95fdcc19767636bd3487464ebf872bcc02f17bd25601ec5a4e2915658de7dbf089621016fd6d29abb37b SHA512 cf9eb731392d539d7e8616487cadc0cf086a2700a58a822605e4562e6ffff6213ceb91e2c978d549c422dc65de1695a979e3af9852760ae5b3f9e18f4780b31b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201001230009-b5b87423c93b.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.mod 270 BLAKE2B b41915c3832f7da9591429edd55565a9db62232673a9788e81d877f70dd574c14a77db730e1b27d25db1cffcb60dc7de926fc39fade1123b3072ac35e848b2cf SHA512 3f901620a7f769ec147d5b7af39969c5992990c0fde2ba8eb8b1d513dec5dd1804d7ddfc49e80911152a24fd837ef008d210af54585485bed8136dcec5b6c863
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201002184944-ecd9fd270d5d.zip 3277895 BLAKE2B 7679bd5ce5de4ead73602ca8c4d1186108912500d50f4afb05ec7e21527fd293ffc0dd62158b7942b376e78b9b8c902a24c87033de65fd722b9ba0a0f91573ca SHA512 f0f21c3e49b9b07ac65cf4ec686abc06a7c55f1b0243fdeb812276510add6a5e8d64763e085444a75f6028d80b31ad17f53f69b652516821fc3cf231a4a70bdd
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
+DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.mod 244 BLAKE2B e1c9e0e208e8266bfefa1c13476cbbefa99145c8413fd398f1c266a9c9a15d93f75ab1686b98fa30b7ead4591144e25106d49dea9f6bc796b295787f5687872c SHA512 32e1bd01a2120bb997efcbe00edba411a172047364e578d1faccf642c8dc4c6923df24329ae1467bbdb4e48aeee57ea49ba9fedbaa2382e1b2108982d44453fb
+DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200321-0.20200715051853-507f148e1c42.zip 157666 BLAKE2B bc0da287fac44e4f0eba8b0574fb842dcec9d5139827baeddd70c85ccb3d57e4ca9567b7aa6938bac024b5822a29f64f5f46bc541cc49b38be1f72fc5ca2b4ff SHA512 08f128856501e4993aa03ab97775ea42060c80dd5a56aad031251d234d567745684da4e9580db4670a410892702e5a63f620abb713ff3737a751dde7759b2cfe
+DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.mod 635 BLAKE2B 2f7f50ae2057f0173347205f215fc68451b06c6e500c6c0203910d8876150eed8b406dbff2bf78704dbd6afb9f6392865d6316eb348460009efac87ff83be598 SHA512 cc751cf3cc15688c9b231692a98404f39dde8e7b7fa89228164ab725e060cfcc56a05de617f4f2e5d390acc5df1502a2bd14c40dbaf7e82209266ee55ce27f0a
+DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.2-0.20201004085714-dd60d0447f81.zip 364066 BLAKE2B fc388babfcfdf133a6e4ff26b9b571073ecea55418673ee304fdd73f09e0248450a23831bd141203a58ee9cb37ef5063b44736e0f47943f77eaa1115d90fa30a SHA512 d3d14ee62f00a80113671da69cb00d82b9d533c68f4ce4fa77c7c49bd3a35afb5c87160c7bbbfed87a542ea1055cdc25d1c576c76c1f2020e56b7f768327f55c
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 DIST gortc.io%2Fstun%2F@v%2Fv1.22.1.mod 30 BLAKE2B ebe4c3ce49779332e6622a802eebc7533873a76e7a8f4ff0949dda910f3a89aaf4d0c1923503e976ae45d9fe11eaaa9d9d1bccbb6746fa011e85cd74fe1e003e SHA512 b2dfe24c7e28b9430b503908a877ee2e39223604aad87f433ae240bc8479e89dbd35a3aec422fe1280e111fdace3b2064586ab688f5561954b924d17cb070e4a
 DIST gortc.io%2Fstun%2F@v%2Fv1.22.1.zip 112943 BLAKE2B e3d5dd997468dcb8939d22d74da74da6ebf597201797f2a6c9540901d5d4b3674562da6cb4585e76d26be5cc4b9bd5f15543b6e38e23219f9e50f3707e3c55d3 SHA512 acdb251f3ea4fbc6e5e6c3e6cd214ba87979f1f0d62852af29873289d320fbc9e77fba275a9d71fe0323b95cde4cabf8af844528677784fa8a46b85d7233fedc
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip 561290 BLAKE2B 2bdf9fb92ee838f5a9112bc5e3ace3e1cdc7a4dd5b3940c94b36abdbd6def28f9629a49e9ec901a32b76c944cc82af19f0f99f281b15ce666ebf153d062bc052 SHA512 9d01facc2b973a45604ac010f0bf0ec6aa3121966eaea6d7e1ac15869a8f5892077c3bbf0cbc21517890e24379848b8def33bf7dee7b1152ce232dd996ad017f
 DIST inet.af%2F@v%2Fv0.0.0-20181218191229-53da77bc832c.zip 12990 BLAKE2B 61969b5d79184802857a957f55103c173a1aeaef7885a426480f05cb0b804f7d9fc3de0ae772525950382731fd4564296eb1fa80ffd0ca9a4a211955e4d834e0 SHA512 e0717672def38953829fda1f2e23e723bf774e16b4a185201b0fa0184b53fd7af7e73e179b55a6b9592653f97363059c667910b2d505c947b6b932f783d14288
 DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417144406-01f6d1b213c8.mod 32 BLAKE2B 68b268af15eda4caa8aca5109911f5c17b83f91ffcd2f1bbe4bf43610ae434fdceba3a04fced5393461f824f7a0899861ea3089737d01514958a1067e1958355 SHA512 6344d85c845d92fa393c0c63d02a7219012b6c046764b3b7311e0ba08f24ec9cb7f075deb7506a6ce343981b07afd73308266d034892779443a91f06ca56b28f
 DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417144406-01f6d1b213c8.zip 10357 BLAKE2B 6694c0a33fc9f607f37f4a665ca65f4ffc16b99b8da024f25ce057d888456fb71bf27b0a3ddb12b745ecf87d5ae7ad9d08d0c4665640be55022983df05972878 SHA512 29950178102c20d8a387c22dd76fa122b70918ca453240690783acabb13e5e26b308f8cbf78c0ccc4f53d5d380139664f0a8c9e2a915a09dd80f246db386fa49
@@ -155,9 +234,12 @@ DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417205003-27c4b435b671.mod 32 BLAKE2B
 DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417205003-27c4b435b671.zip 10684 BLAKE2B e6dd2b28da6ddd200e8e31437b6dd934d71efe1b077be8e5fbd97f98b025acd26956aa7cbc46f23b5c1ee1b1404a2f5f6ec6864b575b7a24a6022a1012ed34e7 SHA512 d21d86d196504351a2c1ef7782455268bfc482694a0c9d5a23d119f53d6863aa5afd772c09367872ca7d56003ad007f38ef2d969ba14f26fc48c1a87c0fb4049
 DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417213433-f9e5bcc2d6ea.mod 32 BLAKE2B 68b268af15eda4caa8aca5109911f5c17b83f91ffcd2f1bbe4bf43610ae434fdceba3a04fced5393461f824f7a0899861ea3089737d01514958a1067e1958355 SHA512 6344d85c845d92fa393c0c63d02a7219012b6c046764b3b7311e0ba08f24ec9cb7f075deb7506a6ce343981b07afd73308266d034892779443a91f06ca56b28f
 DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200417213433-f9e5bcc2d6ea.zip 11163 BLAKE2B 22fd2671047e9d1ea8281f579b873bd90075682271cb73f4abe725f8e6bb1f8714e2df2712b6032b9ddb993a6a7db74d79771eb364ae609019096ce78835192f SHA512 c0d7f4554d521db063a7f751217918b46c969828284c1594a52ebf64c19acbecab03953d5ab7378cde273bec98c9961d9eae1da658ab1e5966956797dfee4391
+DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.mod 32 BLAKE2B 68b268af15eda4caa8aca5109911f5c17b83f91ffcd2f1bbe4bf43610ae434fdceba3a04fced5393461f824f7a0899861ea3089737d01514958a1067e1958355 SHA512 6344d85c845d92fa393c0c63d02a7219012b6c046764b3b7311e0ba08f24ec9cb7f075deb7506a6ce343981b07afd73308266d034892779443a91f06ca56b28f
+DIST inet.af%2Fnetaddr%2F@v%2Fv0.0.0-20200810144936-56928fe48a98.zip 16191 BLAKE2B 13fa50ad47d5eac496efa500b7293a383a612fa1af213730883cbf584ad95c176aabce1ae01df68ffefa627b0b72abe5f1d7f2494867ecbd432a1f34b83e6451 SHA512 94049290cf6c3b8a4b2b9c1094742ff036f179806ba4f22941edf358182d831072a2d27e71ac6b65824d0fce7609c7b395b9419458abdb8db3ff76312c2914ce
 DIST rsc.io%2Fgoversion%2F@v%2Fv1.2.0.mod 24 BLAKE2B f34fad63946a0d32855728c5efe5a52372014f1745be5b6cbe329f53d99fd3e5808e745a04fca76f5bd63a4009d0ec765baf1ae5777c2dd4a892f39674136b99 SHA512 d43d5a4c338311c5e86ee46284f4ac7ef94cf3f0245b1115d8489182ae4163d283aefa010ba0a865e4248dd9cb130f018cc6336b425c3ab53f96df75e6c17944
 DIST rsc.io%2Fgoversion%2F@v%2Fv1.2.0.zip 10585 BLAKE2B e395e10714385e74c2f183d1bb64977cdd36bfb8af9966209300c4a33c04cab91cfd435d19df76097855968e992f5bea5859e15162b054574e8f5375b14024ca SHA512 56df49fc828163e44c836b8e7b8d4a48ff05449f548a7518ceba4af06e270e5a0de842c8b5912e3e462bf5180cf885d2330543e212de8d9ab500bee64c2546a6
 DIST tailscale-0.98.tar.gz 219233 BLAKE2B 9902be178e160cc1ce41d192e8dab3bbf5950351c8dbe80ec2958afa751ab7b9a88cb50978d2192b840afa288f3c94e4e28027b4829afe0c3576872634ed60c4 SHA512 a6b175fe438639c6d8e27e55f6d1d8aa7ad101e7c5d9d3b0672144aef1aa7be6a787d5feb3fca306f92ed9e8083901930c94c3f1220086b60189426bcd909488
+DIST tailscale-1.2.10.tar.gz 441791 BLAKE2B 85a6b3359d808b280baac2b3fe943c3647f09cc09233dff789a634d3d84c8ede11a4876bb77a1045b86ca68466f93aa01248180e5eb2cda388bb57939a0eeff2 SHA512 67046bf9e5d49058d8f510e4541f50e5bbdd0cca2a6ca76f3e98734d3244f79ddcb7e23da29854b9ef7064227b42b24793b4992d983156ab6d65940c6b5e6b79
 DIST tailscale_0.98-0_386.tgz 11772623 BLAKE2B 085f798bb1aabc8f6e286184428cca84cc552037bb67b503227e7c56acc90b6b9b860d3147498bbdeb5dc39164d472ba4ea441b93a57dd37b5aa4a977f2f1702 SHA512 10bbdbc7da71e018189eb63fe126237bd978cad8169a824f8bf70c065e53bd3d0f2741ce0bf7f810f27f68a273d33caf4cd086acde51956109c0d5317862352e
 DIST tailscale_0.98-0_amd64.tgz 12080659 BLAKE2B f3935a51c0210930d93c1779022e0e11508a92899fab5ba50c2a14a8670bc03a601de18847c02428971188647b60ba0154b12027c5d4224d47735964fa031ef7 SHA512 119ffa7a7035327b388dbabc118b37cc4af5f0b2bc01a4a757719b37659fefc2363eb48ef68c8009a05bff3cf3caf92a5f918683f49cdb052fc6c618ad08ed45
 DIST tailscale_0.98-0_arm.tgz 11276678 BLAKE2B 06e176c8fcd68761b8c3a9399e189b7793d2284315187b77c5c36309d6e5d8ce3a4675531315a47cba54fb402b0f07e02bcf2f9cd4c502f99131d86a1b0e422b SHA512 95913a397d636188d9673d1eca37e3b4fcf87ade0fcf7b69d086b2d05e5d854aba786ace03a1b7f406d02140a0c9197c925a5666c8a3bc1d11e15479f6440deb
diff --git a/net-vpn/tailscale/metadata.xml b/net-vpn/tailscale/metadata.xml
index 126b9ca42a25..fcf4cb517a00 100644
--- a/net-vpn/tailscale/metadata.xml
+++ b/net-vpn/tailscale/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">
+		<name>William Hubbs</name>
+		<email>williamh@gentoo.org</email>
+	</maintainer>
 	<maintainer type="person">
 		<name>Patrick McLean</name>
 		<email>chutzpah@gentoo.org</email>
diff --git a/net-vpn/tailscale/tailscale-1.2.10.ebuild b/net-vpn/tailscale/tailscale-1.2.10.ebuild
new file mode 100644
index 000000000000..ee0de7c859cc
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-1.2.10.ebuild
@@ -0,0 +1,241 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd tmpfiles
+
+DESCRIPTION="Tailscale vpn client"
+HOMEPAGE="https://tailscale.com"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.34.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+	"github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5"
+	"github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/apenwarr/fixconsole v0.0.0-20191012055117-5a9f6489cc29"
+	"github.com/apenwarr/fixconsole v0.0.0-20191012055117-5a9f6489cc29/go.mod"
+	"github.com/apenwarr/w32 v0.0.0-20190407065021-aa00fece76ab"
+	"github.com/apenwarr/w32 v0.0.0-20190407065021-aa00fece76ab/go.mod"
+	"github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb"
+	"github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod"
+	"github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e"
+	"github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod"
+	"github.com/coreos/go-iptables v0.4.5"
+	"github.com/coreos/go-iptables v0.4.5/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/gliderlabs/ssh v0.2.2"
+	"github.com/gliderlabs/ssh v0.2.2/go.mod"
+	"github.com/go-multierror/multierror v1.0.2"
+	"github.com/go-multierror/multierror v1.0.2/go.mod"
+	"github.com/go-ole/go-ole v1.2.4"
+	"github.com/go-ole/go-ole v1.2.4/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/protobuf v1.2.0"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0"
+	"github.com/google/rpmpack v0.0.0-20191226140753-aa36bfddb3a0/go.mod"
+	"github.com/goreleaser/nfpm v1.1.10"
+	"github.com/goreleaser/nfpm v1.1.10/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4"
+	"github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.10.10"
+	"github.com/klauspost/compress v1.10.10/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1/go.mod"
+	"github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4/go.mod"
+	"github.com/mattn/go-zglob v0.0.1"
+	"github.com/mattn/go-zglob v0.0.1/go.mod"
+	"github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod"
+	"github.com/mdlayher/netlink v1.0.0/go.mod"
+	"github.com/mdlayher/netlink v1.1.0"
+	"github.com/mdlayher/netlink v1.1.0/go.mod"
+	"github.com/miekg/dns v1.1.30"
+	"github.com/miekg/dns v1.1.30/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3"
+	"github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3/go.mod"
+	"github.com/pelletier/go-toml v1.6.0/go.mod"
+	"github.com/peterbourgon/ff/v2 v2.0.0"
+	"github.com/peterbourgon/ff/v2 v2.0.0/go.mod"
+	"github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7"
+	"github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b"
+	"github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/tailscale/depaware v0.0.0-20201003033024-5d95aab075be"
+	"github.com/tailscale/depaware v0.0.0-20201003033024-5d95aab075be/go.mod"
+	"github.com/tailscale/wireguard-go v0.0.0-20200921221757-11a958a67bdd"
+	"github.com/tailscale/wireguard-go v0.0.0-20200921221757-11a958a67bdd/go.mod"
+	"github.com/tailscale/wireguard-go v0.0.0-20201008164108-2c83f43a9859"
+	"github.com/tailscale/wireguard-go v0.0.0-20201008164108-2c83f43a9859/go.mod"
+	"github.com/tailscale/wireguard-go v0.0.0-20201021041318-a6168fd06b3f"
+	"github.com/tailscale/wireguard-go v0.0.0-20201021041318-a6168fd06b3f/go.mod"
+	"github.com/tcnksm/go-httpstat v0.2.0"
+	"github.com/tcnksm/go-httpstat v0.2.0/go.mod"
+	"github.com/toqueteos/webbrowser v1.2.0"
+	"github.com/toqueteos/webbrowser v1.2.0/go.mod"
+	"github.com/ulikunitz/xz v0.5.6"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8"
+	"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"go4.org/mem v0.0.0-20200706164138-185c595c3ecc"
+	"go4.org/mem v0.0.0-20200706164138-185c595c3ecc/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899"
+	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod"
+	"golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
+	"golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod"
+	"golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200812155832-6a926be9bd1d"
+	"golang.org/x/sys v0.0.0-20200812155832-6a926be9bd1d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/tools v0.0.0-20201001230009-b5b87423c93b/go.mod"
+	"golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d"
+	"golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"golang.zx2c4.com/wireguard v0.0.20200321-0.20200715051853-507f148e1c42"
+	"golang.zx2c4.com/wireguard v0.0.20200321-0.20200715051853-507f148e1c42/go.mod"
+	"golang.zx2c4.com/wireguard/windows v0.1.2-0.20201004085714-dd60d0447f81"
+	"golang.zx2c4.com/wireguard/windows v0.1.2-0.20201004085714-dd60d0447f81/go.mod"
+	"google.golang.org/appengine v1.4.0"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"inet.af/netaddr v0.0.0-20200810144936-56928fe48a98"
+	"inet.af/netaddr v0.0.0-20200810144936-56928fe48a98/go.mod"
+	"rsc.io/goversion v1.2.0"
+	"rsc.io/goversion v1.2.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="net-firewall/iptables"
+
+src_compile() {
+	GOBIN="${S}"/bin \
+		go install ./cmd/tailscale{,d} || die "compile failed"
+}
+
+src_install() {
+	dosbin bin/${PN}d
+	dobin bin/${PN}
+
+	systemd_dounit cmd/tailscaled/tailscaled.service
+	insinto /etc/default
+	newins cmd/tailscaled/tailscaled.defaults tailscaled
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 88e64f64ad76..49c3cd24c24f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index c6604dc698f3..867b10b32718 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Rolf Eike Beer <eike@sf-mail.de> (2020-12-14)
+# noone actually tests it on real hardware anymore
+x11-base/xorg-server xorg
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-12-11)
 # not all needed sphinx modules are stable on hppa.
 dev-python/aiohttp doc
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 21eb2c9e1837..cc8cbed6dd30 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Matt Turner <mattst88@gentoo.org> (2020-12-14)
+# dev-lang/php is not stable for hppa
+php
+
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/gstreamer is not stable for hppa
 gstreamer
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 70e3d1e505da..e08549f1c246 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -6,6 +6,7 @@
 # runtime bugs (bug #758446) which are not worth it.
 # Building Firefox/Thunderbird with GCC is no longer supported
 # in Gentoo until further notice.
+dev-lang/spidermonkey clang
 mail-client/thunderbird clang
 www-client/firefox clang
 
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 097ee8b095ea..1a09d0c5d9f8 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -10,7 +10,7 @@ www-misc/profile-sync-daemon
 
 # Jason Zaman <perfinion@gentoo.org> (2015-06-27)
 # SystemD has no support in the SELinux policy at the moment.
-# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
+# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F
 app-admin/systemdgenie
 app-eselect/eselect-gnome-shell-extensions
 app-office/wps-office
diff --git a/profiles/package.mask b/profiles/package.mask
index 8bfea7d46006..99f2521a5e98 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -541,8 +541,8 @@ kde-apps/kdebase-meta:5
 >=dev-lua/luacov-0.14.0-r100
 >=dev-lua/luadbi-0.7.2-r100
 >=dev-lua/luaevent-0.4.6-r100
-=dev-lua/luaexpat-1.3.0-r101
-=dev-lua/luaexpat-1.3.3-r101
+=dev-lua/luaexpat-1.3.0-r102
+=dev-lua/luaexpat-1.3.3-r102
 >=dev-lua/luafilesystem-1.8.0-r100
 >=dev-lua/lualdap-1.2.5-r100
 >=dev-lua/luajson-1.3.4-r100
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0eca9fca5f28..f459ca3457c3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1479,8 +1479,6 @@ dev-haskell/chimera:representable - Define Representable instance from adjunctio
 dev-haskell/cmark:system-cmark - use app-text/cmark instead of bundled copy
 dev-haskell/cmdargs:quotation - Build quote module
 dev-haskell/cmdargs:testprog - Build the test program
-dev-haskell/comonad:containers - You can disable the use of the `containers` package using `-f-containers`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/comonad:distributive - You can disable the use of the `distributive` package using `-f-distributive`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If disabled we will not supply instances of `Distributive`
 dev-haskell/comonad:test-doctests - Run the doctests test suite
 dev-haskell/contravariant:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:statevar - You can disable the use of the `StateVar` package using `-f-StateVar`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -1870,6 +1868,7 @@ dev-lang/rust-bin:rls - Install rls, Rust Language Server (used with IDEs suppor
 dev-lang/rust-bin:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
+dev-lang/spidermonkey:clang - Use Clang compiler instead of GCC
 dev-lang/spidermonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
 dev-lang/spidermonkey:debug - Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems
 dev-lang/spidermonkey:lto - Enable Link Time Optimization (LTO)
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1c24a9d8e924..d8e5d40af6f4 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild
index 0bacae1be5cb..6dc83abed745 100644
--- a/sci-libs/cddlib/cddlib-094m-r1.ebuild
+++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild
@@ -3,9 +3,10 @@
 
 EAPI=7
 
-# This should have been dealt with versionator in the direction
-# 0.94x -> 094x - now we are screwed.
-MY_PV="0.94m"
+# This can't work forever; but for now, it's better than hard-coding the
+# correct version string.
+MY_PV="${PV:0:1}.${PV:1}"
+
 MY_P="${PN}-${MY_PV}"
 DESCRIPTION="C library implementing the Double Description Method"
 HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index e65017032f3a..edf9d7c5f503 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,2 +1,3 @@
 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
+DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
new file mode 100644
index 000000000000..3e76f1f265de
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+MY_P=${PN}-${PV/_p/-pl}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+else
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="3.0/3"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	quad? ( sys-devel/gcc[fortran] )
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+HTML_DOCS=( doc/html/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if ! tc-is-gcc; then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix info file for category directory
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	# jlec reported USE=quad on abi_x86_32 has too few registers
+	# stub Makefiles
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
+		mkdir -p "${BUILD_DIR}/tests" || die
+		echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+		echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+		echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+		return 0
+	fi
+
+	local myconf=(
+		--enable-shared
+		--disable-static
+		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		$(use_enable threads)
+		$(use_enable openmp)
+	)
+	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
+	case "${MULTIBUILD_ID}" in
+		single-*)
+			# altivec, sse, single-paired only work for single
+			myconf+=(
+				--enable-single
+				$(use_enable cpu_flags_ppc_altivec altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable cpu_flags_arm_neon neon)
+				$(use_enable mpi)
+			)
+			;;
+
+		double-*)
+			myconf+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_avx2 avx2)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+			;;
+
+		longdouble-*)
+			myconf+=(
+				--enable-long-double
+				$(use_enable mpi)
+			)
+			;;
+
+		quad-*)
+			# quad does not support mpi
+			myconf+=(
+				--enable-quad-precision
+			)
+			;;
+
+		*)
+			die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
+			;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC)"
+}
+
+src_configure() {
+	# upstream does not append proper -m flags
+	# https://bugs.gentoo.org/698572
+	use cpu_flags_x86_avx2 && append-flags -mavx2
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake -C tests smallcheck
+}
+
+src_test() {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	# local testbase="perl check.pl --nthreads=1 --estimate"
+	#     ${testbase} -${p}d || die "Failure: $n"
+
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
+
+	if use doc; then
+		dodoc doc/*.pdf
+		docinto faq
+		dodoc -r doc/FAQ/fftw-faq.html/.
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+
+	local x
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		local u
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
+		done
+	done
+
+	# fftw uses pkg-config to record its private dependencies
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index d92ed1ac2ad5..3d5b307ce05a 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
@@ -12,26 +12,27 @@ HOMEPAGE="http://www.fftw.org/"
 
 MY_P=${PN}-${PV/_p/-pl}
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
 	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2+"
 SLOT="3.0/3"
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
+IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi openmp quad test threads zbus"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	quad? ( sys-devel/gcc[fortran] )
 	test? ( dev-lang/perl )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
@@ -60,13 +61,7 @@ src_prepare() {
 	default
 
 	# fix info file for category directory
-	if [[ ${PV} = *9999 ]]; then
-		sed -i -e
-			's/Texinfo documentation system/Libraries/' \
-			doc/fftw3."info" || die "failed to fix info file"
-
-		eautoreconf
-	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
@@ -82,13 +77,15 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
-		$(use_enable static-libs static)
+		--disable-static
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
 		$(use_enable zbus mips-zbus-timer)
 		$(use_enable threads)
 		$(use_enable openmp)
 	)
+	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
+
 	case "${MULTIBUILD_ID}" in
 		single-*)
 			# altivec, sse, single-paired only work for single
@@ -99,7 +96,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable neon)
+				$(use_enable cpu_flags_arm_neon neon)
 				$(use_enable mpi)
 			)
 			;;
@@ -166,11 +163,11 @@ src_install() {
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
 	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
+		rm -r "${ED}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
-	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
 		local u
 		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
 			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -178,5 +175,5 @@ src_install() {
 	done
 
 	# fftw uses pkg-config to record its private dependencies
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/sci-libs/gdal/gdal-3.2.0.ebuild b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
similarity index 99%
rename from sci-libs/gdal/gdal-3.2.0.ebuild
rename to sci-libs/gdal/gdal-3.2.0-r1.ebuild
index 22a0b0533224..ae2043bc588d 100644
--- a/sci-libs/gdal/gdal-3.2.0.ebuild
+++ b/sci-libs/gdal/gdal-3.2.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Translator library for raster geospatial data formats (includes OGR
 HOMEPAGE="https://gdal.org/"
 SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
-SLOT="0/3.0"
+SLOT="0/3.2"
 LICENSE="BSD Info-ZIP MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
@@ -162,7 +162,6 @@ src_configure() {
 		--without-podofo
 		--without-python
 		--without-qhull
-		--without-sde
 		--without-sfcgal
 		--without-sosi
 		--without-teigha
diff --git a/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
new file mode 100644
index 000000000000..d890f696388d
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-8.2.0-pugixml.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/758611
+--- a/IO/CityGML/CMakeLists.txt
++++ b/IO/CityGML/CMakeLists.txt
+@@ -5,7 +5,4 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
+ if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
+   find_package(pugixml REQUIRED)
+-  get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
+-  get_target_property(pugixml_LIBRARIES pugixml LOCATION)
+-  include_directories(${pugixml_INCLUDE_DIRS})
+-  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
++  vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE pugixml::pugixml)
+ endif()
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
new file mode 100644
index 000000000000..d0d4b52214cf
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="all-modules aqua boost doc examples ffmpeg gdal imaging java json mpi
+	odbc offscreen postgres python qt5 R rendering tbb tcl theora tk
+	video_cards_nvidia views web +X xdmf2"
+
+REQUIRED_USE="
+	all-modules? ( python xdmf2 boost )
+	java? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	examples? ( python )
+	tk? ( tcl )
+	web? ( python )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-cpp/eigen
+	dev-db/sqlite
+	dev-libs/double-conversion:0=
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.11
+	>=media-libs/freetype-2.5.4
+	media-libs/glew:0=
+	>=media-libs/libharu-2.3.0-r2
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf:0=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( dev-libs/boost:=[mpi?] )
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	ffmpeg? ( media-video/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	java? ( >=virtual/jdk-1.7:* )
+	mpi? (
+		virtual/mpi[cxx,romio]
+		$(python_gen_cond_dep '
+			python? ( dev-python/mpi4py[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qtx11extras:5
+		$(python_gen_cond_dep '
+			python? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	R? ( dev-lang/R )
+	tbb? ( dev-cpp/tbb )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	web? (
+		${WEBAPP_DEPEND}
+		$(python_gen_cond_dep '
+			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	xdmf2? ( sci-libs/xdmf2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.1.0-openmpi-4-compatibility.patch
+	"${FILESDIR}"/${P}-qt-5.15.patch # bug 726960
+	"${FILESDIR}"/${P}-gcc-10.patch # bug 723374
+	"${FILESDIR}"/${P}-fno-common.patch # bug 721048
+	"${FILESDIR}"/${P}-py38.patch
+	"${FILESDIR}"/${P}-freetype-2.10.3-provide-FT_CALLBACK_DEF.patch # bug #751088
+	"${FILESDIR}"/${P}-pugixml.patch
+)
+
+RESTRICT="test"
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	local x
+	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+	for x in expat freetype hdf5 jpeg jsoncpp libharu libxml2 lz4 netcdf pugixml png tiff zlib; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+
+	sed -i -e '/add_subdirectory(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
+	sed -i -e '/vtk_target_export(vtkpugixml)/d' ThirdParty/pugixml/CMakeLists.txt || die
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_INSTALL_PACKAGE_DIR="$(get_libdir)/cmake/${PN}-${SPV}"
+		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_AUTOBAHN=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ=OFF
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PUGIXML=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_XDMF3=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+		-DVTK_USE_SYSTEM_DIY2=OFF
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_LARGE_DATA=ON
+		-DVTK_USE_PARALLEL=ON
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+		-DVTK_Group_Imaging=$(usex imaging)
+		-DVTK_Group_MPI=$(usex mpi)
+		-DVTK_Group_Rendering=$(usex rendering)
+		-DVTK_Group_Tk=$(usex tk)
+		-DVTK_Group_Views=$(usex views)
+		-DVTK_Group_Web=$(usex web)
+		-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
+		-DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
+		-DVTK_WRAP_JAVA=$(usex java)
+		-DVTK_WRAP_PYTHON=$(usex python)
+		-DVTK_WRAP_PYTHON_SIP=$(usex python)
+		-DVTK_WRAP_TCL=$(usex tcl)
+		-DVTK_USE_BOOST=$(usex boost)
+		-DUSE_VTK_USE_BOOST=$(usex boost)
+		-DModule_vtkInfovisBoost=$(usex boost)
+		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+		-DVTK_USE_ODBC=$(usex odbc)
+		-DModule_vtkIOODBC=$(usex odbc)
+		-DVTK_USE_OFFSCREEN=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
+		-DVTK_USE_X=$(usex X)
+	# IO
+		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+		-DModule_vtkIOGDAL=$(usex gdal)
+		-DModule_vtkIOGeoJSON=$(usex json)
+		-DModule_vtkIOXdmf2=$(usex xdmf2)
+		-DBUILD_TESTING=$(usex examples)
+	# Apple stuff, does it really work?
+		-DVTK_USE_COCOA=$(usex aqua)
+	)
+
+	if use java; then
+		local javacargs=$(java-pkg_javac-args)
+		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+	fi
+
+	if use mpi; then
+		mycmakeargs+=( -DVTK_USE_SYSTEM_MPI4PY=ON )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+			-DVTK_USE_SYSTEM_SIX=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR="$(basename $(qt5_get_libdir))/qt5/plugins/designer"
+			-DDESIRED_QT_VERSION=5
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+		)
+	fi
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	cmake_src_install
+
+	use java && java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}.jar
+
+	# Stop web page images from being compressed
+	use doc && docompress -x /usr/share/doc/${PF}/doxygen
+
+	if use tcl; then
+		# install Tcl docs
+		docinto vtk_tcl
+		docinto .
+	fi
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 3d01c8bf019a..daa9f7c35635 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 16f6be65ab64..c79b502012d8 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,2 +1,3 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
+DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
new file mode 100644
index 000000000000..7983540e7260
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -0,0 +1,30 @@
+# 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.gentoo.org/git/proj/gentoo-systemd-integration.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/systemd-207
+	!sys-fs/eudev
+	!sys-fs/udev"
+DEPEND=">=sys-apps/systemd-207"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} != 9999 ]] || eautoreconf
+}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 37315de4274a..7983540e7260 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-inherit systemd
-
 DESCRIPTION="systemd integration files for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
 
@@ -23,8 +21,8 @@ IUSE=""
 RDEPEND=">=sys-apps/systemd-207
 	!sys-fs/eudev
 	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207
-	virtual/pkgconfig"
+DEPEND=">=sys-apps/systemd-207"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 4b261bf1db65..61ff7357dc4e 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
index 7e0c1fe7bcf9..37af51d68ce8 100644
--- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
+++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
@@ -1 +1,2 @@
+DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6
 DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
new file mode 100644
index 000000000000..38d2b40eea18
--- /dev/null
+++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
+HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
+	https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
+MY_PN=firmware-nonfree
+SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="Broadcom"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+pkg_pretend() {
+	local -a BADFILES=()
+	local txt file
+	# /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
+	# The above pattern works because the files we want to hit
+	# have names of the form:
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+	# While the files installed by raspberrypi-wifi-ucode have names
+	# of the form:
+	# * /lib/firmware/brcm/brcmfmac43430-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43436-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43455-sdio.txt
+	# * /lib/firmware/brcm/brcmfmac43456-sdio.txt
+	# So no overlap is assured.
+	for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
+		[[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
+	done
+
+	if [[ "${#BADFILES[@]}" -gt 1 ]]; then
+		eerror "The following files should be excluded from the savedconfig of"
+		eerror "linux-firmware and linux-firmware should be re-emerged. Even"
+		eerror "though they do not collide with files from ${PN},"
+		eerror "they may be loaded preferentially to the files included in"
+		eerror "${PN}, leading to undefined behaviour."
+		eerror "List of files:"
+		for file in "${BADFILES[@]}"; do
+			eerror "${file}"
+		done
+	fi
+}
+
+src_prepare() {
+	default
+	eapply -p1 debian/patches/sdio-txt-files.patch
+}
+
+src_install() {
+	insinto /lib/firmware/brcm
+	doins brcm/*
+	dodoc debian/changelog
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a5489833dcc9..04380f8d5414 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index dc763d40f49f..2a27a32ca976 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,2 +1,3 @@
 DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8
 DIST android-file-transfer-linux-4.0.tar.gz 820094 BLAKE2B 1cb7150647e09a9f3dbe30cdf8ff01e122c9bab5a450c9bbe58fc8e3c8b48de0e2b6d571c8e7fa71de25fff28b803ef60aed7f8a77129919bdf9f482fff975ee SHA512 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1
+DIST android-file-transfer-linux-4.1.tar.gz 820290 BLAKE2B 598a4ae25cc5110c38534d1b2b49c034f3dee3f8ab9e47835b4543acecf80521c102e0b8cdf89a19801b178a8fdbbd09e866b957b3ab5886700a26e6c00f8a1b SHA512 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild
new file mode 100644
index 000000000000..3ef7155a7e2c
--- /dev/null
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild
@@ -0,0 +1,80 @@
+# 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 python-single-r1 xdg
+
+DESCRIPTION="Android File Transfer for Linux"
+HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
+
+if [[ "${PV}" = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
+else
+	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="fuse libressl python qt5 taglib zune"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-apps/file
+	sys-libs/readline:0=
+	fuse? ( sys-fs/fuse:0 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+	taglib? ( media-libs/taglib )
+	zune? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+# required to override src_prepare from xdg eclass
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FUSE="$(usex fuse)"
+		-DBUILD_MTPZ="$(usex zune)"
+		-DBUILD_PYTHON="$(usex python)"
+		-DBUILD_QT_UI="$(usex qt5)"
+		-DBUILD_SHARED_LIB="ON"
+		-DBUILD_TAGLIB="$(usex taglib)"
+		# Upstream recommends to keep this off as libusb is broken
+		-DUSB_BACKEND_LIBUSB="OFF"
+		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
+	)
+	cmake_src_configure
+}
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 515775501e94..9aad93609658 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -30,16 +30,22 @@ PATCHES=(
 
 mdadm_emake() {
 	# We should probably make corosync & libdlm into USE flags. #573782
-	emake \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		UDEVDIR="$(get_udevdir)" \
-		SYSTEMD_DIR="$(systemd_get_systemunitdir)" \
-		COROSYNC="-DNO_COROSYNC" \
-		DLM="-DNO_DLM" \
+	local args=(
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		CC="$(tc-getCC)"
+		CWFLAGS="-Wall"
+		CXFLAGS="${CFLAGS}"
+		UDEVDIR="$(get_udevdir)"
+		SYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		COROSYNC="-DNO_COROSYNC"
+		DLM="-DNO_DLM"
+
+		# https://bugs.gentoo.org/732276
+		STRIP=
+
 		"$@"
+	)
+	emake "${args[@]}"
 }
 
 src_compile() {
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index a741a9724ea7..7a495d78f432 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,3 +1,4 @@
+DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd
 DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
new file mode 100644
index 000000000000..1661c39dc4e8
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.10.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu libedit nls"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	libedit? ( dev-libs/libedit[static-libs(+)] )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/inih
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	emake DIST_ROOT="${ED}" install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9028f39b937e..f46b533d57d2 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index dbb808012ffa..fe59ea14340a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -46,6 +46,12 @@ DIST genpatches-4.9-251.extras.tar.xz 3340 BLAKE2B 3c539c1e45ab2f01cd74883fc997c
 DIST genpatches-4.9-252.base.tar.xz 4445040 BLAKE2B 71c1cd51d02b47c8484b7d394471bfe25ed94406d5894a20f8190cbeaa4575931f8262ec773b80e469aed2758dd40dab18dcd7c55bc48789c8adaa2496bef28a SHA512 d5473bc19e3ee0b19d4fac84fe0d18744aa80b8898e128b757ec69202d0272c77769b2381a96d66d251f49ee067fbbe04685d2a26f155a13b06ab292babf7d73
 DIST genpatches-4.9-252.experimental.tar.xz 106372 BLAKE2B 9cb2511bf248e447d65e32f5d4887f54912fef8094969dbe23b2a549273587b0d78d2422611e677b63f20fc316e1fcbb06325b93fe105ccacdf9dfaa91508620 SHA512 c889f8ecb1629b7f9c8e214696d17405b403332565553cfb8b0009a39c87a40fc9de3e8519e29b1adb20c7cf82ea387fc9b94bea02bfe535e1306091b4310390
 DIST genpatches-4.9-252.extras.tar.xz 3340 BLAKE2B b95706a8fa234bac2c42aa71f820adb68c8f805f6e0c9ada6724a78b27918683c700ce30f21ef3510379870d039dc69879f8454399938525a0571f46bf611f3a SHA512 be5a3ef3bf9adeca5d5cbb2f53e20d24006630b0bc545176d2a06cc40714f74c62a1d443842ddd003d3214aa743b83acc21d138ca2228820311646f66aa105aa
+DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
+DIST genpatches-5.10-1.experimental.tar.xz 6100 BLAKE2B b3342fc8c9071e5fbb70a6bcd5fca15416c3fc08b0686582a56dbe213e6ec3a95b48df2f0bfa5bcf6ab00ee90ea529b630f77058abed45ea9dfad8c66dbcde67 SHA512 a5eb064bc1dd5947b957afc8db8b0bba30b0097c35b8e592b6fc38e9323cf1b9c11d17346fbae4dc38d7205fd261542c88d16f14d71f9c1c8cca41fe1b4da09d
+DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
+DIST genpatches-5.10-2.base.tar.xz 4604 BLAKE2B ab25c50b6fa200f303b2e9f6f203730da460feea7b473d8be794c833c180239b0cb59abf115a58c4a6c671c30297cdc3eda86aeeb47451395d39571d45bd9033 SHA512 550c34ae1c8434b06d07108f126d6fa386b065d19439226c375623b5f37aa36aec642f318f82148dde168fd85e154ceaeb35d1b88271e62a20675752f6b33c60
+DIST genpatches-5.10-2.experimental.tar.xz 6092 BLAKE2B 395d889688bf4c1391aa1a1fea98808e3471163e547d82cbff6804b847e7d828be0019a66e92a50d83a753749ac1669f0da980abf22155089d7d1fb4da3075d3 SHA512 31af3ec09131df058b9e2a7f8de5f85a7c0e881a2087334a14355549c7e1d85ed0e12200d7090d6aea2b6034112331812fe87ab0574554b4e2af7ec9dcccc7cb
+DIST genpatches-5.10-2.extras.tar.xz 1772 BLAKE2B f4bc68ab7c83508265848d9782ce19046a5870c428a9b2e99c473c7c1e6451bdbe2e22152e5ec81812502547b6282e5286dcc2da591481249d75ba69985300a2 SHA512 ab99eae22f08f5894b5b027440e715558da9fe80542f824a260bce9951dda6059dca705a4b29cf3b5e295726eef9c1942a5d114259702733d7f6f6b68f828020
 DIST genpatches-5.4-73.base.tar.xz 2527064 BLAKE2B 6e0b392681d6e5e709a02c1c8f15fe06ef1651f1530506982feec7fd436aa04ea75079eeb5d3a61c91bcbb46c59a232cb8cb67c62fa7b2e8b289591142dd9430 SHA512 db987b95895fc37243e3697f3ef8f33787489e173fefb84ad09a6600898b2b9b285d9113e6f867aab0c3d5b4c65398f4bcbc40a4220f3cf2b355da9def209dae
 DIST genpatches-5.4-73.experimental.tar.xz 6696 BLAKE2B e722d747bcb24b501f3d63c8f6fdade889b620794bdd6fe0931c044147d32f5d9b3fe503fb9afe476cf1e791ca0d1247edb47df3a1d547c99e9a3107a2522139 SHA512 7ae9228a9677f3b7888ff8286b1db8ca5cad14fe829efbcb8da8dfe7e82bdeac95368a0dfb2e7bbf0ea82a2b103f5c2ee3c99826c89eec7e07f3be70bcd51430
 DIST genpatches-5.4-73.extras.tar.xz 1772 BLAKE2B 7475a0907f287fef28ee8bf220932528107bbac0d612dc05de6ca8b2dd86ddf37d9acea31ab2977a677f6ea3a19c594737b23e504da405fa811c4d0faf00b94a SHA512 751898547b1f60070f1d8431cd89daff55e33473c8fe68415a15e3b8079ae2d3e44318815ba47a1ce9750feb1cac1812eb8eb7765426b204eb1357993cc68cb0
@@ -71,5 +77,6 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.0.ebuild
new file mode 100644
index 000000000000..db8d28cb5da1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.1.ebuild
new file mode 100644
index 000000000000..4e9e6431f2e4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index 9db0ec943cd2..6f671c986215 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,2 +1,3 @@
 DIST linux-4.19.114.tar.xz 103432512 BLAKE2B b35122b6ff2871053d136c5a259ca0c18b12f5b5854df791508fb8d00dd6cef7b3afe436d604c8bc4628b525a166c9d81697c4938707074d9a15d737841828d7 SHA512 a99b3eb2e458199d4143464f3e35023ed5e7fe26e09f1dcddbbd7e6709cf6fea065012a3d0d538c0d22123b97647bc0265de7f79ea7c756ed5192dc0b78a8b06
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.4.39.tar.xz 109528644 BLAKE2B 359300cf9628267e5f450623d6ca5e0a918201f3f376c680412e8dad8a196ee86b5b50ccefb95c4ea9e40b0acfdffad07947e64092be4b6b0aa565068615ed12 SHA512 d95a1bace75430a8502ffd5d2225f449580b8cff3d68bd084e4792eceb18a38ae8092f223ef7834bf2b2bcc7cb21487bedc01ae8f1640db14c83bf8dfbcc7360
diff --git a/sys-kernel/linux-docs/linux-docs-5.10.0.ebuild b/sys-kernel/linux-docs/linux-docs-5.10.0.ebuild
new file mode 100644
index 000000000000..2b1d4fcb3da2
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-5.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+MY_P=linux-${MY_PV}
+
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Developer documentation generated from the Linux kernel"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v5.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE=""
+BDEPEND="media-libs/fontconfig"
+DEPEND="dev-python/sphinx"
+RDEPEND=""
+
+src_compile() {
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+	emake htmldocs
+}
+
+src_install() {
+	HTML_DOCS=( Documentation/output/. )
+	einstalldocs
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 99026c9bee2e..1d8879da5e67 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,12 +1,16 @@
+DIST genpatches-5.10-1.base.tar.xz 3840 BLAKE2B 08ac1f83dc9a1cfc1d4cf0a3a5ab4c9d4686a80348247ec7cd1da6e49db92d6932a1864113f2631d5528a4ba732945b2afe73d03061bd3c532b3d1e4d9571999 SHA512 04356093c4df6a7ee0876b89be5b90f8bc90c920628e5fe69b5787ce82e003be05eaac142310f10f32d0549a6676af846734ae4ac188c2b96c2eca2cb0a6f4b0
+DIST genpatches-5.10-1.extras.tar.xz 1768 BLAKE2B e99d5d2137d5752845ba8284a0dd57620851c3620603e871973af5841b54e9bfdde92ea2408ddedb55355f2c954c80641b06098060043916d2483e10cfb8293a SHA512 0034e5ab57cccb2e969a3b9e1f674614ca853779c552c37be9c5afb0a37112bf8f2c30e1b21832d56320c70c1d622081b60369c6a86fa737a23c3ed953267453
 DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
 DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
 DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
 DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
 DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
 DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
+DIST pf-sources-5.10_p1.patch 2523647 BLAKE2B d31c389dbebd45068919f30680f63ab601d13a25b7b81daf1e7a0f46fd59c4803c644b8f53e944ec2078ef4c8a5e80ae71bcd1126161cd8432dbe3e742fc938f SHA512 c911efe868be9cb56814a50f08a79fa159e8b8225c3700e8367a4147d219fb82ea86ab21026a071afbc07da955d02b557eab53b4d5c7d6616580076b6822428d
 DIST pf-sources-5.7_p7.patch 2471776 BLAKE2B c87c9a5f159967877a2858da1af919332aa9ccd49c2029950b31bcce592b9e802c4d5d5daf2f86929bf9318aaa455d879d3eba21904ab38e5615f05742934a98 SHA512 11c0f0021c1d67f65461a74598ed355309c5bdea8d8c94a8e59bcdff2a8320f9504a4457dd8adddcbfc85cd753bff6018ab9a093cfd7d70dcfee4a2f82110d30
 DIST pf-sources-5.8_p7.patch 2546471 BLAKE2B 9eae65836ee0a4e67737462325753b6201c40fcf93f99a114e929f9557fb7bcf9ea619c2502f7824db6bdcf96c7a7640ad0cc1ff5dafa494a532e6f9ee4964b2 SHA512 0449f4ac292d8b0ac6222c273bc535acae5b1e8bdb9c6d196098d61de78fce6739911094bc8f710e4ef3ec187964ee8a146aa09c87f241e816ef5515272059eb
 DIST pf-sources-5.9_p1.patch 35818 BLAKE2B c28c292b527c1116b927861dbcdfb948e1e7d30018ecacfa89425fb0b357f2a2cb93daa681ad6a940f936b255453770c743db2a95f8ad67bd6ab772febae7a76 SHA512 82f5583fdb8862a628265f188473fc2cfaaad1ffb06292248a69fc012058f743906aca7abcd88fa223e32f0a626748ae8111fa6858629182d0482989a0f7f725
@@ -14,3 +18,4 @@ DIST pf-sources-5.9_p2.patch 1222181 BLAKE2B 1a444ba68ade78f7862c474d52c021064ed
 DIST pf-sources-5.9_p4.patch 1978557 BLAKE2B 1863fbf17732dad7e6f96b2ddfb66b424cc4cf9649eaff06b9e043e763a6d7a5941a80f3a1d2b6edc9987da41b3e9eb346c1fd63422f14f5cee285fb2de12f0e SHA512 d08011d285cfc1db431a92de9e58f5c3bde3e556cbca3237a7fd9ca234b9598c34b71482d0a9ac117e1fa15860c64aaa60c61435443c7cfa0548a620fe992b16
 DIST pf-sources-5.9_p5.patch 2334422 BLAKE2B e90fa94cc371995f36dda11b0d758c157254a4bf7f47ee31af34a83b6a4b6ebb3720d9bfaf752705c5cf3e2fd53cb7df1399654bdf20803c5a1a72e9c731aad8 SHA512 e562acccafa1ca2cd743ad20f5920a61607b27aa1310552e5a3cbf822668886c49ce020fd381d4ce987ec9f77f3c6e861fe83e697acfcbe2d0a5665619614cc8
 DIST pf-sources-5.9_p6.patch 2906787 BLAKE2B 23478dbafee1637661544d0deba45b619acadfc4a368b7f1530358450a0c4112556a779866a31de3b68f1bc1788028d408cc530b40fd1250e30c92f7b85f996a SHA512 eb31a8efbf80c1b22bb491b59b540a1cd3e03b8d20dd97a233b6ab118baa5d4ed7b4f3bd5c02df6ab268f1f38bee08c6219e0d2f88a73da73ee8897c75223b1f
+DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
diff --git a/sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild
new file mode 100644
index 000000000000..f2344adc15dc
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.10_p1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
new file mode 100644
index 000000000000..f2344adc15dc
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.9_p7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 94ebe470ed03..0dbdeeee0f92 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,4 +1,5 @@
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
 DIST raspberrypi-firmware-1.20200902.tar.gz 187144306 BLAKE2B 33a9449fd98fffaa80a9c748f8dd246db491b4f5eb1335ffd10bfacdbe4396c2faabfe522129d287663ad5ef0e9322bd7302a74d6d874e9125f165dc50b81d90 SHA512 91d084d2dba99219b72cc03d49d9546e070477d35fa151b42e204ec6b77ee76a8774235cc32cec8c3aa4360b7c1922dd1c65da8489300476290af87e167f0c79
 DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
+DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.79_p20201201.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.79_p20201201.ebuild
new file mode 100644
index 000000000000..dd284762191f
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.79_p20201201.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	[[ "$(ver_cut 4)" == 'p' ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index f4bef639a260..3ce6a7c19137 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,5 +9,6 @@ DIST patch-4.14.212.xz 4050296 BLAKE2B 3fbd7a00bc7282dafc48e02ca8e6d9fd8e332064b
 DIST patch-4.19.163.xz 3661280 BLAKE2B 182cdeec98f3c4a5ec057e3f286f8019ff5cc22d23863a08b820aeb8404fd34afae913c0bdb06c4d4f571c9146cd13778eedba840e2920f9af2348c5c38fad12 SHA512 6302649e09aae6e35d7963de5dbe4edf9e9fe5439e67188bd604929752853e5e57e31c140e76db87f2cf79345ca254e4b9a893489942c87159aea62746e10663
 DIST patch-4.4.248.xz 3410928 BLAKE2B 548f4ed485224bd9ebea24dbd0190a7e6380d1ed9ac18cfb46409860da7239a3b7fc9bbfc03669943dbf5b85c286a54c00de01d615771d2eddc1e9f6a7e45f38 SHA512 f46a60f0846b5823d9e353caeb1a1576952c57cc55d109854f0c7a5c3c5ebd164fdace6e266778f74e2b03a09b3e71f1ae1965b78124e2536592ec2a8696e4f8
 DIST patch-4.9.248.xz 3795904 BLAKE2B afa043b3b72b3c5172c7efdfbb9debebe1048af2a0857d2e322c1ca0b17e8d703812a69ac411c2c5746bcf4cd8239e799439bc76cad690dbf457e91370964c62 SHA512 a45de2faab294eab3a3643cd86248d112fee0a58a770cd5b58100c44979a49bd1ec4e19296337b6ca1f7bf927e8e16511748506c0f23f87f5a280b3f7ebb2a26
+DIST patch-5.10.1.xz 940 BLAKE2B 3f3feb8c2ce909bcceda525bd7c8aed0949b53cebd2094d0a4af2342bfe7d1f78ab341d64fb91c89a2cd3a78f5fcf8bade4b75ca22e18c4a42c5e1cfcfe66cd5 SHA512 4fa17c2525cf67f71bcdd232cd98f1a00cf9596987e73909ef9638b9e74886c4d752375ba1b9b8020f544b2d6fac23630fc090111a4e79b880dbb81629bd1503
 DIST patch-5.4.83.xz 2409776 BLAKE2B f65f3cde8fc7964ba926f7aee253f32c380c2f25fcd441081d5eb4becf4a8a3f30c5794ed5ecf5c6f2754d4d64a663162b4b0dd4bd7c36eb3e21e9f2ea01cfa4 SHA512 2653a4e66c0fe10f1f637db711f93c3b365262ce68f33230ca53ac7e63c54913b3ccd26083a6b947a624ee828ec94cac215a98a665f97c2aa4e2962caf8917d3
 DIST patch-5.9.14.xz 637952 BLAKE2B fc328fa4c15423668b250b6516b8ea1a543d1b0fa4b55a493bd2c88225e6a7b391cd3fe6c40c3468937741d98b160c4e1b7f6883c21d3a352e4f4258b07a166e SHA512 d63fc8ca45e78ed5e13d1092d1a3707cbff0cd2f13a066255f7cf707dbffd96480c33ac52b73dc101ce4a0e2b7604c6dd5db1e2f5f6bfd1fcd17876de30ebb9a
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.1.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.0.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.1.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index bdd922de7425..6e45e1ed21ee 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/db/db-4.2.52_p5-r3.ebuild b/sys-libs/db/db-4.2.52_p5-r3.ebuild
index dd191ead6b9f..9280a2a20aeb 100644
--- a/sys-libs/db/db-4.2.52_p5-r3.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r3.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="tcl java doc cxx"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/db/db-6.2.38.ebuild b/sys-libs/db/db-6.2.38.ebuild
index 091651e008b5..7f8d9f870aed 100644
--- a/sys-libs/db/db-6.2.38.ebuild
+++ b/sys-libs/db/db-6.2.38.ebuild
@@ -29,7 +29,7 @@ done
 
 LICENSE="AGPL-3"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc java cxx tcl test"
 
 REQUIRED_USE="test? ( tcl )"
@@ -38,7 +38,8 @@ REQUIRED_USE="test? ( tcl )"
 DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jdk-1.5 )
-	>=sys-devel/binutils-2.16.1"
+	kernel_linux? ( >=sys-devel/binutils-2.16.1 )
+	kernel_SunOS? ( >=sys-devel/binutils-2.16.1 )"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.5 )"
 
@@ -148,7 +149,7 @@ multilib_src_configure() {
 
 	# Add linker versions to the symbols. Easier to do, and safer than header file
 	# mumbo jumbo.
-	if use userland_GNU ; then
+	if use kernel_linux || use kernel_SunOS; then
 		append-ldflags -Wl,--default-symver
 	fi
 
diff --git a/sys-libs/libblockdev/libblockdev-2.24.ebuild b/sys-libs/libblockdev/libblockdev-2.24.ebuild
index 04aa60d48088..413a9123fade 100644
--- a/sys-libs/libblockdev/libblockdev-2.24.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index 1ad37598e5fe..29119d41e3eb 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 98256cb8ff05..c24cc40930b4 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,3 +1,6 @@
 DIST libcap-ng-0.7.11.tar.gz 450541 BLAKE2B 66217f7fb9e3b3876ada6f355a2b69f16fda4ab3ab490e524358c4120583280ce6497770ec6452596426594b877d79c0e03db10d6413c1cf20bd01e996f7347b SHA512 150c4f48d7334966aa7af683e46bc3b8b4d4a2e80be826e6f6a61a0ea0666e2f4dafcd012c536fa321c4954c00059c689cc8d6dc089000ca1dca2fd52e3efe9c
+DIST libcap-ng-0.8.1.tar.gz 454950 BLAKE2B d2d8902526f1cb6f1f579ec4ca1ca33bf45db325eac07a94b97dcee58411f8657591a840cb7420a94617bf8c21858c4b31138ca3126f6cfaff6b8c82b991149f SHA512 cd28ceb43e2cf5d3a0140fddbd2ea13dfda8eeea8a6de1817f3cc3b38df874ab8653917dbd405ad7aaaa71bcb9ec246d995079aa3cb0af1cffbdb37dfdd99232
+DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8
+DIST libcap-ng-0.8.2-apply.patch 2898 BLAKE2B 4c388bc2a61646639a78b6b3038a1027df7807076b9d0bef7c850e8c86e354260eaee47b4f3d10a1db3d961584935005e155eba04a38decbe4256fc3e5fab968 SHA512 1d3d443c524fb4b885702b460f7ec7eda6377ed571528ca679add9494eb8172ead607ba32e139d4150672e81e79e12687a5b09c93d4f24eb2edb1381c2ced76d
 DIST libcap-ng-0.8.2.tar.gz 456066 BLAKE2B 7e721d05b92fd3708b970527e76b1898daa91bde3ab6ed5d8f23b1435404fbe7d15731461c6d9d2c791738e5498d1f5eaba727413480d34b7edea13c8691c32b SHA512 0ac6e55c03b1fba3a849048b721e250951afb59190d9646704d4fd9938eccc3bd0767380fbddc42f186b4f55695475e31f34f537ae91c04a37662577a5b7a19b
 DIST libcap-ng-0.8.tar.gz 453181 BLAKE2B 8f4b2e13e5c2c21f1ac1455ebdaf04b42e07fa79d9026651f41eab041cdf99bd40d91b8ce2262e58bc2de3e2a793f676df8c69d832ccadfa4b486ebefeb4b128 SHA512 d410d66f46ad25765f35ffac17e0d36740329c334c6535d55a13fa218718a750763b7ad4610efa47efe7c256c143ead7dde7d37a29e99cb5c55161f577c40bb2
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..a83d11757d88
--- /dev/null
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.1-r1.ebuild
@@ -0,0 +1,98 @@
+# 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 autotools flag-o-matic python-r1
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
+# Fedora 0.8.1 https://src.fedoraproject.org/rpms/libcap-ng/c/49e3114cf75fabe9919300e42f7b151eee9e37d1?branch=master
+# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master
+SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/49e3114cf75fabe9919300e42f7b151eee9e37d1/f/libcap-ng-0.8.2-apply.patch
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+BDEPEND="python? ( >=dev-lang/swig-2 )"
+
+PATCHES=(
+	"${DISTDIR}"/libcap-ng-0.8.2-apply.patch
+	"${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch
+)
+
+src_prepare() {
+	default
+	if use prefix ; then
+		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
+		eautomake #668722
+	fi
+}
+
+src_configure() {
+	use sparc && replace-flags -O? -O0
+
+	local ECONF_SOURCE="${S}"
+
+	local myconf=(
+		$(use_enable static-libs static)
+	)
+
+	local pythonconf=( --without-python --without-python3 )
+
+	# set up python bindings build(s)
+	if use python ; then
+		setup_python_flags_configure() {
+			pythonconf=( --without-python --with-python3 )
+			run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+		}
+
+		python_foreach_impl setup_python_flags_configure
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}"
+	fi
+}
+
+src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions."
+		return
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" check
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	else
+		local BUILD_DIR=${WORKDIR}/build
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.2.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
similarity index 84%
rename from sys-libs/libcap-ng/libcap-ng-0.8.2.ebuild
rename to sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
index 846ebcd8aae4..ba79ffe1c0b6 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.8.2.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.2-r1.ebuild
@@ -9,7 +9,9 @@ inherit autotools flag-o-matic python-r1
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
+# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master
+SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz
+		https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
 BDEPEND="python? ( >=dev-lang/swig-2 )"
 
+PATCHES=(
+	"${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch
+)
+
 src_prepare() {
 	default
 	if use prefix ; then
diff --git a/sys-libs/libunwind/libunwind-1.5.0.ebuild b/sys-libs/libunwind/libunwind-1.5.0.ebuild
index 187e84c1b7ba..a09a8c109789 100644
--- a/sys-libs/libunwind/libunwind-1.5.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs zlib"
 
 RESTRICT="test" # some tests are broken (toolchain version dependent, rely on external binaries)
diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild
index e6dbe274fd69..a1ea35754f4b 100644
--- a/sys-libs/talloc/talloc-2.3.1.ebuild
+++ b/sys-libs/talloc/talloc-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit waf-utils python-single-r1 multilib multilib-minimal
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9e6c0088b837..fa12a421c102 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/httpd-php/httpd-php-7.2.ebuild b/virtual/httpd-php/httpd-php-7.2.ebuild
index e521d711ceba..53f85af7a6d1 100644
--- a/virtual/httpd-php/httpd-php-7.2.ebuild
+++ b/virtual/httpd-php/httpd-php-7.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.3.ebuild b/virtual/httpd-php/httpd-php-7.3.ebuild
index e521d711ceba..53f85af7a6d1 100644
--- a/virtual/httpd-php/httpd-php-7.3.ebuild
+++ b/virtual/httpd-php/httpd-php-7.3.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.4.ebuild b/virtual/httpd-php/httpd-php-7.4.ebuild
index 9cebbd935b14..9d36c62a591f 100644
--- a/virtual/httpd-php/httpd-php-7.4.ebuild
+++ b/virtual/httpd-php/httpd-php-7.4.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d97cdb7350a5..3205a29b976b 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index 04b08efe1e1f..565e7913a187 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,2 +1 @@
 DIST airdcpp-webui-2.10.0.tgz 8135065 BLAKE2B a14cd4be3745386ef05d4bdb96b0f60b10d55abeb734f752cacba44a34e9e7615c26a52136c93fb1965c31fb36f5eadfebac0aa84b73f9cd4c36190b11a69fbd SHA512 7dcd8261be48e570e125cd3b31738fa7b5970fd78c15f86c78abc929801cc86d0e56909d7c653394575e156513a6454094708c22d2241ba6541a1350fcce2085
-DIST airdcpp-webui-2.9.0.tgz 7891520 BLAKE2B ca597a1b0c844abb6b220d5241842dad6f68686f2aa8b250b094fd6baebd0697abe5019c4d7f0b3213398b056d8fa1b4d5d7e55bd9bf30245eb737c37cbb20b7 SHA512 7a80077f7e56c1ebb5dc2e358e6866021b308d05306d1716e2e5c6f3b64f9f65aa5f88a44cae228671665eb413e8ba7ae842de9f94fa7a8ab967a8b36903e2bb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild
deleted file mode 100644
index aed6a3249e7e..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Web interface for airdcpp-webclient"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="=net-p2p/airdcpp-webclient-${PV%.*}*"
-
-S="${WORKDIR}/package"
-
-src_install() {
-	insinto "/usr/share/airdcpp/web-resources"
-	doins -r dist/.
-}
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 90c50989b944..78ab2bbb979e 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1 +1 @@
-DIST gitea-1.12.6.tar.gz 135134376 BLAKE2B 762f5403a9c5524182c717d6d028ad7fae2ce01d66960635d5e3d1e0ad9027c431efb3604a89061d5354ac126eea8e412b52d9c9d1243b1dc56b9ecbabd2e7db SHA512 c581f84ffe793b80e445c70f3e60ed54a663ef2b2579959b4f1bd4ce5aa0f470ef6d6b13476cc920e615e18ef79ff461896c75ce8282f9b774e939dbbe1f2a49
+DIST gitea-1.13.0.tar.gz 150897624 BLAKE2B b09d3a695a399bfff813f45faf7435eb0b512d448e8329142d8131be786e0dee822a8491c58c8537545350162c89db39cbaaa0ba58c467f2494137f1313a9fec SHA512 bdcc1d3f53ba2b8a6c9964bc15449d3ea237853dfeb2f1da1e4c9f68fb5f09188b3fcef9a1c004ea774003181a85758eb95cff909cc39f6caa611b0505628739
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
deleted file mode 100644
index 9baff97307a0..000000000000
--- a/www-apps/gitea/files/1.12-fix-vendoring.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vendor/modules.txt b/vendor/modules.txt
-index efbc866..1c34104 100644
---- a/vendor/modules.txt
-+++ b/vendor/modules.txt
-@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
- # mvdan.cc/xurls/v2 v2.1.0
- ## explicit
- mvdan.cc/xurls/v2
-+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
-+## explicit
- # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
- ## explicit
- strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.12.6.ebuild b/www-apps/gitea/gitea-1.13.0.ebuild
similarity index 90%
rename from www-apps/gitea/gitea-1.12.6.ebuild
rename to www-apps/gitea/gitea-1.13.0.ebuild
index f4f0af94aa84..7bb52ed548ee 100644
--- a/www-apps/gitea/gitea-1.12.6.ebuild
+++ b/www-apps/gitea/gitea-1.13.0.ebuild
@@ -33,14 +33,11 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
-PATCHES=(
-	"${FILESDIR}/1.12-fix-vendoring.patch"
-)
 
 RESTRICT="test"
 QA_PRESTRIPPED="usr/bin/gitea"
@@ -49,7 +46,6 @@ src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
 		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
 		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
@@ -58,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
 	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
 	fi
 
 	einfo "Remove tests which are known to fail with network-sandbox enabled."
@@ -117,7 +111,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	newins custom/conf/app.example.ini app.ini
 	if use acct ; then
 		fowners root:git /etc/gitea/{,app.ini}
 		fperms g+w,o-rwx /etc/gitea/{,app.ini}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 672af6461ca6..d6f5cfcf5a8e 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -33,17 +33,19 @@ RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
 DOCS=(
-	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
 )
 FILECAPS=(
 	cap_net_bind_service+ep usr/bin/gitea
 )
 
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
 src_prepare() {
 	default
 
 	local sedcmds=(
-		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
 		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
 		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
 		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
@@ -52,13 +54,11 @@ src_prepare() {
 		-e "s#^LEVEL = Trace#LEVEL = Info#"
 		-e "s#^LOG_SQL = true#LOG_SQL = false#"
 		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-		-e "s#^APP_ID =#;APP_ID =#"
-		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
 	)
 
-	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
 	if use sqlite ; then
-		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
 	fi
 
 	einfo "Remove tests which are known to fail with network-sandbox enabled."
@@ -104,7 +104,7 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
 
 	insinto /etc/gitea
-	newins custom/conf/app.ini.sample app.ini
+	newins custom/conf/app.example.ini app.ini
 	if use acct ; then
 		fowners root:git /etc/gitea/{,app.ini}
 		fperms g+w,o-rwx /etc/gitea/{,app.ini}
@@ -114,3 +114,9 @@ src_install() {
 		keepdir /var/log/gitea
 	fi
 }
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+	tmpfiles_process gitea.conf
+}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
index add7f99210ee..375b614eaee1 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
 SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 RDEPEND="
 	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 93d77bf94948..764f1642b1c7 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 5c124fd4d5da..d68a94354d40 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -93,6 +93,101 @@ DIST firefox-78.5.0esr-vi.xpi 562859 BLAKE2B 13a92bc91690b74159ec2d6ebe4ec1d9dfe
 DIST firefox-78.5.0esr-xh.xpi 427806 BLAKE2B 676da7d81426b40c2649b225733df74ff8d1cde06e40e2f20d9ae192b30404982a2ea25b1a7e22fa07dbca87d5505db08ccf0328d9b1bc87e50d745fe83d157d SHA512 d9fb321cb914aab442b28114d107a7af3614a8763cd6fa29fcc7507f995c6e4b09a3d3c2ae035b5e4985ac925cd4c7c3416f1c0f4603d301362a984e79a0649d
 DIST firefox-78.5.0esr-zh-CN.xpi 564767 BLAKE2B b5c3e773c3bc58ba80180bd018467df1552b8cf355ca33d96fd4153e169acbdb64dd22f3b4b7449046a02835f406046d2847b161f6220edca6c087cc9e5a8c25 SHA512 489052281501ba642270d65ece7b6c4e5bf2e7ca5101b9dca4c657000e8affd06d838b7ca06d6d399b35d401d288b44d18da2661d3a2c96a04214fd8bf4a4bde
 DIST firefox-78.5.0esr-zh-TW.xpi 564724 BLAKE2B d55faedb630ecc2629d1e2b1adcfd4cde51d119fd4599d25ef0800e5875efea65db5102fec36366b6531791f16d0f94e8e0dee0bdc18868ad9bf5208471d65c3 SHA512 95e4fa378cf07927b13a9b0e9d37d6320c4cba26f26df6dfab65fcfe1ddd21d38cb5a387663c8c96b6b3e2015999af4d355c0b672848f874101c998abd117047
+DIST firefox-78.6.0esr-ach.xpi 460291 BLAKE2B ce5b89a49f04126db1893c488a0d5c2d7b32ced7110526a62ba7254d872339b01de8d8fc4bbc842d2e4f5d074cd5d2975cae1239c31abcfb986e30ab35e121f5 SHA512 9fe7142739c19f7ff65963a70f22fb31d4da676b72ed1974571611d24c033ef1ba43dc0680ddbe4ff9c08860bd65be59842483018eae1fc9d7a03d949ee56af2
+DIST firefox-78.6.0esr-af.xpi 428364 BLAKE2B da06e67acd64ab7a8405325d7af12a3d546f8e0eba7ab5608857faebd900d7530efa024b137350ea447d986cf7f57cfacce0a07e2e577dd0b2c18af456234064 SHA512 d18f2c6915f5c21b59deee498b38bedaecfc31aec66048817ce853193f16064b86fbc6006351dd28c500a34446c67de6aeba8a32f612de8187667ec2bcc1f2ff
+DIST firefox-78.6.0esr-an.xpi 508367 BLAKE2B 8ce5975d635260d0f7412c373b6cf24293bc88063d52a4022a0ce0b45ce0be5f80af43d203afbac148f5b24b8058b9b223a9f74ecf63f2931667093c7a0dc79e SHA512 293bcdc394a3ef88fbc696795934ff8b9e0a735c698c6536e27dd7051176f86e3a0686902c929672ef9ccbca9e7f48a0fc731e0745f7055b70e9c3913af15191
+DIST firefox-78.6.0esr-ar.xpi 560954 BLAKE2B 625419e32abecff7c394db3ad17cfb04fa5885beb3748b7e34501bf10598ec1770c3919a2f9747ab1b72bd765d1e6ab484ea7b965d0f7cb4ce6951b02292ac3e SHA512 60663351dcf501bd0153c5e739d903b59cd4ca2a84413f6eb109b7ed814ef9c5b156c46f53b1f540d830ef45cdff1de3d6a651b868f7d975f4d8d062904b7c18
+DIST firefox-78.6.0esr-ast.xpi 456387 BLAKE2B 89ebe475ffc4187cabfdce581d9d425903da40eb5851ccd736623ae4d892e13b7aead5b159393e47a5d26027fc241fae3abb1229eccf0013c0852667fc559ac0 SHA512 5cd6666a682a887d63bfb50256a065a678058eeda569b3642ecf44009971ce6a6b6c1c9a8febe4508f988c3e83bbd83defe579295ae099b9d23aad041ce0953f
+DIST firefox-78.6.0esr-az.xpi 497439 BLAKE2B 0011bd73b1be903d23ec7761fb28db08275dbb3f30e20d746fdb5cb3fe0ff565a66aae4d8496e32df93f89aef1e9cbd824e99524deaefab25ca36c4e6ea9bb6b SHA512 2005f5c5d6095a3d5444db2a4ecfc09d471bc9b9dedf92f5dc8099cd7ad48a5e3aa6489679ff1ac726f974b9790618733ce8e27122fe776ccfdc982425354a4d
+DIST firefox-78.6.0esr-be.xpi 608650 BLAKE2B b7e263175025c656ccd9cf78e9c599621fe2a3099e9cbf0c6717446e8eda93a8b747e7f024372b07b3f1801936221b12a3a2275c8c601de6486192a12f393982 SHA512 1dd3c679e61629aa0bb5954354875c43f297dba8be3316f481a55903908765a16a239399fd4b7147569b08f8dacbc8549229739e2e18125fc190e602380e6e43
+DIST firefox-78.6.0esr-bg.xpi 553959 BLAKE2B e17c935553a85c2dfccc90de399a29ae1fa3c515e3f2a113bcfc6f1bd0485d1e646617083764d5043395368000fb3dcf26472855160ed1cecf2f1459016e83d9 SHA512 0fbad857366bb0749c34b51d9a21852c371e31918f7fe93faaf3d7cedd382753d059af9a3d2f378933ce883eac3d44c6253fc4fed57165260b8964e4a238dbc2
+DIST firefox-78.6.0esr-bn.xpi 572603 BLAKE2B ccf925d9d930044f1b185e239aed584ccf92e9c82190ab32119d292efc85ca3d4763a083110e424d0ff43e422ce7b970ff8018e785a3ef685286d3513138a544 SHA512 1dc1855ba16215b7d24d4044f6a9a4bc8ee18d9cb3ebaccdd6f94a5123c847cbc79d340bbee973158e0c88a03d4f135f30dcc0f5eda43e8923503b75f5c96a9e
+DIST firefox-78.6.0esr-br.xpi 507127 BLAKE2B a73881f1534850bbf8569127a94ef42617b4fb9a6f8960baa134db3a277ab5e15691992599b972aea7196d52f96e774b999da1f622a435e15f1a0ea3ec702c8e SHA512 5790bb75b86da42bf7760f88617abc91ed5aef99b9681e369b29d786d9291fd08bdda72f29c4b6596cfedb8f53f03f97caf1a547382f13666f2449bf592536a9
+DIST firefox-78.6.0esr-bs.xpi 463798 BLAKE2B be85edd662a1e79d35ed170f3470f61f665da491a426d81dc4cb29f1ee47a418ad4c7a20143339b8881cda4f8e866c797d19e16dac51ab8c00ee1dfd5a4b5e3d SHA512 6c4300276a0eeee8cfc5e6c63048c3205e411bedb7bf1b4ba885bf56bbadde4c413aec5d93a7affe65045c23606309f099677e6e2e5a8ef67489015f617cdb59
+DIST firefox-78.6.0esr-ca-valencia.xpi 517172 BLAKE2B 4a666894b4eb7e427f9b50ab5a1fbf3958ef75a5411f54f6621cf55d7f9e33a1be951cb7cd749e50b03bb5ef29a3c873ba0e63900c1e81e4b5bc70c8daa66b23 SHA512 1ded40253bcb409a40169099b8197c9f3d633d99a9c458e6cb9fdda25722a061764901fdb196d3585a81f4177e12b1e943ba980d9472ca898b0918a3a7a7de7d
+DIST firefox-78.6.0esr-ca.xpi 514163 BLAKE2B b40cbb7056d6583ef12255addcc7764b515189086156f28a7095a575ee651e5ae41fcd133962d888d707a1586cd5b3f3eba6cce2adf020db08a57fc5012f743a SHA512 f3f58b859eb77615e61646fcdcd0de3497b9ac1e542dc19c9e9d6eb9cfe0668d68cc4a21412a9f0619c55689084525270256d4e4fa1ac62c379447c53ec55065
+DIST firefox-78.6.0esr-cak.xpi 551544 BLAKE2B 1f1ac280819812faefc59c22a62494acbd01d85c2f438ba108f77b33fdde12251286f6bf6c92a58de301a6c24c50f49530520df2fb6b459934fd65afbb27eb52 SHA512 292f68262d4414f71ec23b80cba96c5eef0a079c840f8b23d1c69edb6775817c39bb7541c67b9e18986e4e562bd0ecdcd4605b9ccc98f31000f4fdf0640260dc
+DIST firefox-78.6.0esr-cs.xpi 540331 BLAKE2B d418167eaec2e0da368ea09c41bd3b7ca12fe90ed826ffbf824dddf6eb421f26bb06acbd33209db5d85ca543c7133590cca9d26c306af372116da2b9d23491f6 SHA512 f7116e25eadd13e6eae2702643d70b15701a6212b6ecb570ba919182b56a2ec36db7896f6390ed7594beeab22e7ff581705100896a837829c7a90c9c30a02263
+DIST firefox-78.6.0esr-cy.xpi 530696 BLAKE2B 082cd0ff23a006655d79f46612a5a7434ca1e716b72b0ec8b72fff23c0edecb0fdf2b01a2e8e5b535bfe4e51f0d56adf699f97a1e39e65dd55d26511e6b1f22d SHA512 6f6f7d34fbd88f83a36ac92f1e86a4a4050a79bc5a2706a5875ea7167abf3a2e57659a5c502f9fa7dd47cf88dcd1827b6f8db314528b6ce2e6ed81672835c1bf
+DIST firefox-78.6.0esr-da.xpi 520281 BLAKE2B 70ca75b633922b377258ebc2f2946293276846294963755f59aed2bcb15fd80ac55a55aeb763281ac365ed9ee3f52bf1d5c9c16a06f7ce6b9203bb5c76081f16 SHA512 63738a26a7056facf12e558aded45ced60799184a2085a670491017266dbe80ea31266ad303688ac9a5f1dc8b75ac83487b703f0d8243681024715cfb81770e8
+DIST firefox-78.6.0esr-de.xpi 542848 BLAKE2B 54545fdcad3d6fd1fd3f85ca29ae66bae7027d7854103ade42858d42dd3ca8b62468ad435772e8b7569bdef4574703ff9d26e1bbbceee72de1c421ab3b9be01d SHA512 a1d92d4c068575365242ab89d737a4672a1fe0cc9b743d70b6e97a230df39d39e9b74e5cc7126e252af7c7734e15740c5471ca805dd4cfbdfed0aa9460cfcb4d
+DIST firefox-78.6.0esr-dsb.xpi 554270 BLAKE2B f855baa0f29315d9bbb31c2a868ff792c688af83520df4eece94087b5022b3e30fa740bde79d622d22d7ea4bd6fa9264df0734c01722a805bc591cfdd375b136 SHA512 399cf0ae2e015e8301a869c3046c3d7e1e0fb526ba10655f2e3264722206897ef2f0c1d65907686bf14d148b52626b273dce0d840be345fefa8acc3eea04e9e4
+DIST firefox-78.6.0esr-el.xpi 626564 BLAKE2B 76a573fd004c872a549fa39db092b9ecc8316febc2ab31389e75edd605a14219f9c7837e986f97852c90dc016f078908dd772b38574a6d00805b4f8079d55f81 SHA512 28815e975294bd6ed7810ea904a8f79d938d7e4f07983367a836d5783206b3aa746347a51009a6bf0c3196b25ec9e713cb8c1d8891db0b4a5c08f90ee12593e3
+DIST firefox-78.6.0esr-en-CA.xpi 497727 BLAKE2B 863bb393fcda0ec1f99ff40a428b22173cfdf308617ab36e6b7b82d536bc26a15fcd7d23a24b3bb698c17c4748be920175f255afd152a2bc7ce9b18c50aeb6a0 SHA512 b1c02403845ce84536b3c3cdef3284fa609f9097311fd1a589b1b7b1d04f2bda5c666dc86aab1638d3b15ca3d26de6f2f27609300e3de400dee3f53683ff01f4
+DIST firefox-78.6.0esr-en-GB.xpi 497586 BLAKE2B 395482db0b64e2a2ab9db2b91287e431f74a71f264bdcff933b8b7ffb4bf5b1cad79d4c046cc82f4cd97dbf8b7b4332b243da77e7af418ce3ace115025c0aa69 SHA512 b38ed7de18a5748917ece600e8ad9a08df45da7a6155a0a874cd386540a679551d72acf15b91222297de36b63dd5ad9256fce98aa96ee4b15e7c396444816c39
+DIST firefox-78.6.0esr-eo.xpi 525730 BLAKE2B 2558a9c8000d92ab3d28fce8218c9be4e9057826ba85cba7a7f01c8dd4f83cd72c281e27ff0c51de6729e073579367e82566e51a169b8052908dd21090f11258 SHA512 40321da3b7b413b5acefe844cda4bdf6273e7106fb49f68c2b2beff7a351346cffb56202dc9e5a1f6c37886b888d2c918ddeb542aa887265da8c1cad2306c982
+DIST firefox-78.6.0esr-es-AR.xpi 535794 BLAKE2B 5791574b22602a133746147c8ca986818f35ec9e2a71e7869fe1665627418fe45d07b4117bc8267bb972b53e041c775da02d179800600090015ef288a216b2cc SHA512 d1d667b982efccf56ab0dcfdfa314f59db13f6057bc251459844a2a6a2eaf7edc68d991aede613a950351752f7eb0fb7ec9f90b79e122265ce7ebce9c83bb1e8
+DIST firefox-78.6.0esr-es-CL.xpi 535350 BLAKE2B 27a24e34ff1ec13df225bff43969692c399c3d2d220f52c278d0b04564d8660354e206686534f124d1fcb9087f34645f339228ff70064977c860d44775e21f1e SHA512 7dcb4c142b31fce28b9aab201ef4ce495fac9af162cd6469b582a9c17060edbd8f6d04346a28393d186cdfcdaa965dabd6af25b0b0eb4ec0ee7e21864ea9cbed
+DIST firefox-78.6.0esr-es-ES.xpi 522711 BLAKE2B 94f4fe0bc5c275c0cc8e0541fbaf03878d12444895d14cf91957178d63bcfa84f7ce17d6ba095d2911a2e08b2e20937f753e515ff94b740ea32fd02ef9c06816 SHA512 04ecf3bf4d7514bb7912dae9b257f92e8fa1d61a1bfc8689d245a58121b0d4bc862e6a8acd4f3a22c73e68727120e700467b7e08b53f900a166dbb89ad14e9ed
+DIST firefox-78.6.0esr-es-MX.xpi 532300 BLAKE2B 8f5286895393ad68a0dd7fb930e670ecc156badf1f4af626685db4bda84f8df5b2b2d40bafb9892672d9b2a94e7aadf7089bde0da2fac031d7d84b46315e0aa0 SHA512 191c839c6d7a76eb6068d6f6838287585f49ea80f740ca4a294aa9badd218ad938dd478f64bfaa5dde818aac6121e03f2ea2cf6a4ab866dd9ef45a3d2bcced4b
+DIST firefox-78.6.0esr-et.xpi 485236 BLAKE2B ab6d46c9c8a0799f810dfb8b63c537a998cd52fb4c9a72449234ea95788fc2c55b1da7797b49c3d4d10ef8195904660339a4f31174ab45e342837b2cdf2b21ae SHA512 74db8193658bbbfc69ead89af2db2d295f923167ef402af83d5ffb436bddea422fbb5f3fd054bdb9ce2f4570f9c11b67d9793b973576a5d150044132144a81ec
+DIST firefox-78.6.0esr-eu.xpi 505881 BLAKE2B 0d7d9a979120851d2a1a392887984bad0cc3f82d7fb1b5f960c5347cfc1894659195d325f82f6bc0eed47a4e3719b7fc160780b5c9391c051d6b62bf289f2616 SHA512 0df7437bfc8927c2287fd3d359555a64f2dd0eaff2d69d85d33f5c52f6756a111d77f1014bb08c0695f3d648866d83fbe9a8d95115d74e7fe7a7c4e73ef62ad0
+DIST firefox-78.6.0esr-fa.xpi 538914 BLAKE2B 2b31854e0b48d87c27455917d50314d5ae94f31d4a87760978956149f23701815596358f5d7209649bfc2227b3f3eb6a7fda62178e40bf89e00daeac22428248 SHA512 c401f5bf69419836d097b9f192fc8f45fe83dc76ac5778782d3fbac5d0bec260b79a53ae6a626bf07dd4a89eecc49d80047d989e674342ea63216c5dcb341b84
+DIST firefox-78.6.0esr-ff.xpi 481611 BLAKE2B 0fbd2e4b9769bd531cdd6240ed2afec4bb58e953393e68005ea4809d3e988dc0d20b42a78d1199fb9fcff0407897808ef17fed111de4745667e233e596232bcb SHA512 d280d7caac62c74b5f70e39b76b6e4b8f2aa6aac41ec1a2a09070ce98287fd40ccf9af45c94c239349fc54d1341d78ae6b36177eb25620f62e4051ef110c9578
+DIST firefox-78.6.0esr-fi.xpi 517921 BLAKE2B 8ab16cf64814e5a78cbf1ea987a674857709b63ba7ee8e31f2fc23910cce17b9b76baa920ac3b3172df7c53675b0a8552ca3ddbf8c1b6b5dfb66eca5a4253861 SHA512 77184bba0efcc224f798b87a7296f87524232ae06710bdb983bfd4de90e97de5aaf66cb5d2fa804b577dd2dd39e496a5429c537251bc544e0cb7902aa6102cdb
+DIST firefox-78.6.0esr-fr.xpi 545887 BLAKE2B b020b71f046ceb1029621502276890ea73b1653ea66c2123c825e84cccd1b43527d98be31ae2ce1c59efc94ecfc95dc52cda30de0c919e1753e8eed3d8e8b515 SHA512 71c18e76dd13e21579385bd68df4426e33473549f5735a76abebbb1f34e5d8ffe082b85de6cd8fa635061bcb6721fd1c86c99524590a5b284b430ff7ee6c39ef
+DIST firefox-78.6.0esr-fy-NL.xpi 532467 BLAKE2B 9e64a9b9716e587629600c55eee11c6d385c75f6255539388106b4eb1171280f8dfd13dec31ba0269deae801a700080ffbf617d4dbec029793759f5931dad6e9 SHA512 932e680407012387364d54442f46fe79dc0ded489dbd8204bc54ac6fe31ba80093cafdfe02351939edd533071a0ba50f7c36ab28162a8b1502378d32276b2f4a
+DIST firefox-78.6.0esr-ga-IE.xpi 466891 BLAKE2B 48dda66a08aaabae1752679ec76f80bfb29facd827cf37550ef57d1325bb1abc98b501853c15c32d5ea6a483ab87f3c44b686e416d39b6545602dc448d94cacc SHA512 4a6e7548262517df7ec01d5d9c1aafb5885486fcc8fec5307df4988fe61061669ca4c9748986566105c1a4842cb73b3e66f728972f10f9a38ac7820da8570a14
+DIST firefox-78.6.0esr-gd.xpi 491882 BLAKE2B e90cd1218805056066079b8be6df9806de5c3c3f79f1f5fdc2c021910f41215508bb45975ba1a47e7d4c55e161450625dbf7221597e5c0807fcbec6282c44563 SHA512 9dfd25f2b1b6365ad6ef165feaf610b3c7bfbb8f62c3d50b72722ff8ee085384dcc2de756209d6dfac5556275a6ab154f2d30f0a175bbc8212fbc59db8e38bad
+DIST firefox-78.6.0esr-gl.xpi 528403 BLAKE2B 7c4f9d965bf73e0d1329814ee599095e3d3da5f84c8f7d386b499c123038bfc64fff3fd9416d9292a1ba791f486eb92c734ddb21b8e31ba852456032bee52098 SHA512 27459340c305f99d3b51902ac7f61f26f2a4d598c45897407ad768135c243de74ca7d2fe87f66667b376e1f3dd68ad7afca514db21dd6441ffe669e722e05a58
+DIST firefox-78.6.0esr-gn.xpi 546471 BLAKE2B 55ca838b866f3a8b717b5c574cb7967309323aef02754d61a9c8d1d029227552361d20ff80c0c5f9c3296234c5f1b31bc64891cfd43566a74d2718deb702fc56 SHA512 3b4411e9caba2725139b6fb396972cc4fb650f7113b48034b71c32d919006b9a33843182626abd01b0a009f1bab63b5d369b98d593cb420cfac09318cfefba5b
+DIST firefox-78.6.0esr-gu-IN.xpi 541429 BLAKE2B 43cb58d64b311adbedfe882d9494e4ec9fd2308261872bacc54f7f9b84e396d9db54c54df8169f978b39a255c5f97bbb51eafed803ab514f75c47e1f9ed71747 SHA512 b4cade1f0cb0a1d05eea109d53869f8ba3c4ce3267cee89761b8d95fe7bc6f81a78f92ea6f22c1d1f638881f13c3517e81a41c16d777f32ddf9575f43c820e5f
+DIST firefox-78.6.0esr-he.xpi 545578 BLAKE2B af75950a65bcd4495c99de4730517392e5f86fdae25a5b7aac7c83a51999de30d9fd3a4c3bcf7bda83cc31e164938aeea7d18baf9a3fd0b7186d5b0fa590f8c7 SHA512 c839bbacb590b9efc88470938b1a464a11239a67fdd5d1c6aacee9c0e202aa492394b830feeafe83a4ba4cbe1a06bdbbdded8e41e9659e5ce70577a886f04b7c
+DIST firefox-78.6.0esr-hi-IN.xpi 567842 BLAKE2B ec9a0106bc7ecc3b861af18fe94c180b22cb64e9443963498daddc8472e59cd10beff9bb344335cd2ba142cfca0690aeff478086492c00717c2cccf47e99f05b SHA512 45cbd2432a2f5fa3424fd4e26449a3e66c05b18491e2d5bbafebaaec7362c03fb9181857d8e5d24aa4774ca07df7a51ace584185882d566d60a4c544e276f441
+DIST firefox-78.6.0esr-hr.xpi 522694 BLAKE2B 84b07197e17a78f296d6e899ff44175c6e3999ca92664253c9d044df93da6691d0f7d1e2b16c7201e60d50d0c6e8264cc581725d0f6f80cf8ca69c614257efbd SHA512 f22a5c64622e1829374f67780519f2366c5087ba6b45807b8b4763ff161fbd37421b293a8aa76043d9ffd037c90ad80b4369128d988ada55ebd1aebc4e75bde8
+DIST firefox-78.6.0esr-hsb.xpi 550668 BLAKE2B 302f9998e1340bab35bcd56b202fea583217e631df21414b2fbdfbb4eb575af2e5c7684466d85dae64534260da74f024a37cc6fed5e8bfe9e0023f4cfd5e60ae SHA512 4c337e042e0ebb53b01499cbed1d563f88278275111936c0f4ce2a6b2db9672d8f6c4c17f74afe967c83018ad6357777fb7e3ee88bfe860f5bbba08d66e9abf4
+DIST firefox-78.6.0esr-hu.xpi 554891 BLAKE2B 025b34b4b8dd9f7eead2b78b7be62a8cf8a5f340d66d8b328c6d65919b8dd087b657dc4344877f1e267c038c94c2e96ec3afe7349f4e806eb006da6fb9fc878e SHA512 cd2bee59551d8ddf4cb112e1716e38a792d709fbd99cd513e7f1c85abee7af818f5b9f5592cd4530714dbeecff10f87bbe90696698f5c9b5eccf3541e3336728
+DIST firefox-78.6.0esr-hy-AM.xpi 588984 BLAKE2B cc3b816936acd93e4df72692d666376b9616493b77da4f0391336f20369bbe5a930736ea16f64235f36aeb85f5dc34349890bc1e78c2f1febe7f4861e077a875 SHA512 4f02afe20a021698af39bca6d25f474cb85a2ea9f596a42fa3116eee2b7ca1fd2b0a30d7bfb0011424f3f2233cf84dcd9236bf9d076635c120c856ac01f005c7
+DIST firefox-78.6.0esr-ia.xpi 518819 BLAKE2B b5125537942d1e6e4486c2e7822270f27a5f1b2c99f47bfc3a47127379c324f1473348361ce0ffd89b008a8fb0e0e68b64c93e70ba13655119ceb6fe478ce6d9 SHA512 58278c0112d1453b506aa49020254cda54da9ca98a277c2aee2f1deb920af73def43ad0ba5c67a666b328ef7679d8eecf9f794c0e2ceedb159b6982cb0de5c8b
+DIST firefox-78.6.0esr-id.xpi 509561 BLAKE2B ea2cbcc04b9fdfed39cba912fd7c560feb8479cd8ce3bace9b04b86cb5b2c73d98c8873d100e19277101f127028ceda7bad8dba815effd60c68ed92f36107f0f SHA512 935be8c85dfd597a8c14cea8c5ef283fe3ec662f6b2acbe39937fcaab51ff10b4309d0ab0ec57de334e4b23737c2a0bd307537e5a158abaf71ff9be4c0a745f1
+DIST firefox-78.6.0esr-is.xpi 477017 BLAKE2B 0beb6e0369ea9a4e21d77c56bc248aa45dd08f0e3eb6dd47d2d3fface003ce6a55c3e46e5ed2dac56b4aaab96cff01e8ffb8f4e6616f1380e825441115267b8d SHA512 b5af6c290ae2c60ab2e3aeb30347fb79e933ae90f272fab4cdd167c2c4fc8129194c6b7a0dd1ef8012c27e39e653f4aa9b7d967cb35a4ccf9fdf4a0dd56eb7cd
+DIST firefox-78.6.0esr-it.xpi 449818 BLAKE2B 0f61527e8900e68408672a86897006ee58416c93e6b8f6b6e91484c01ffa13f0b1f6d3d81892ac89c28aa1adf119389f8c65a10bb3c01846bd58f4534313d119 SHA512 0c6a637756b0d8254aa3dc248cf2bb7fa797d3248085567d864672e0520f6e84d561f415f9b5ae89d44bfb00b5ae331b99aade9566f7d566b2a11bb1507afff0
+DIST firefox-78.6.0esr-ja.xpi 578205 BLAKE2B 1672a0b835ef0e00fe3cbb883a4daa855c35e27508be5d64ddac9e458a2660c67b014edb576fa6d1ab7852a1b6d196b082fdcffb707505793e0fbbd6fc453d86 SHA512 1a71af096bd0014f8872f9a0d077fba71796230881dbefd8213720cfd7643eb0df4b1e7e6acfbfb4e657cfe077c4643ae6f2616bc3abab2ef6a4172e4dfc9ec0
+DIST firefox-78.6.0esr-ka.xpi 579077 BLAKE2B 3ea15b41b333748a502f21e04801663e8571197bc82ea1cd8dda4f8e1508d09b2c8b4d054aeffaee158204e8fb411599c82db8563154ee6b2da12cbf0514bec1 SHA512 e4281dec9a84908fe567db830ccf14848fbbe8f9a6a7d80ca6fdeb54786af6bc1000af686bda1e514d8e2ccbe41653f4309e1fc8d92fa2de86b940d774889cb1
+DIST firefox-78.6.0esr-kab.xpi 539737 BLAKE2B 9eaa5f7481f43671488f82593b6ead90c0954c0e03d63733454c08b186cdb525e8fc97b05b84a299d1e4be28d35bbd1cb0382d95408599b8b1f5cefeb7ae96ec SHA512 fe8ae4aef0b360813038036c3809ffe7d04aa64804f91b4e5ec5961c44ec1416edba28662c7593e8cbdafa55f4c64d8ebbe10b5e0cc1fbd5662e27546fc96119
+DIST firefox-78.6.0esr-kk.xpi 593248 BLAKE2B a4fcaac2e4d157aa7cd6c8a6b83de4947533e9191e8eb1c01d5dacb4f6d51de46a79f776462970525e77effbdb0405c147c1ce92abca819dc7d2df910f3e7996 SHA512 ad081eeab084160ab5040e70e5ec79c9ebd0fb274859dbb5ef7254d710288792bbaa78e6c0d88ec5626c3c33bbe10891e90dd6c0fad83c704d265ca2c4bf6ed8
+DIST firefox-78.6.0esr-km.xpi 527374 BLAKE2B dda77a434eb3436921fa3be7bad6d287966ad9c10471d2cee1632a145b869a9549e630d146a176c075dcd5e3c9798736560865d7bfbeb8d8d7236d2f6b62f6e4 SHA512 149fbc0e0758695f4960f05f0e66b06c48eecfbeaf9f5b6a0b0b12a7ce660483ede3dc749bb732d714db6728a742a2519e5db862fe9be3335569e502100fa7ca
+DIST firefox-78.6.0esr-kn.xpi 506749 BLAKE2B 4128bfb925ebd8d61b7a442776bd70a3db2e4d6cd5b9674137ff6df8c853b8fc14ad94ecb74fa21de9af1781f9ab3d0558f3f320b869ed1bd27c227704cf3a95 SHA512 e7e781b0fb978583a0eec5378061fdf6e6a26bf879f04eb9fc02142ae84389b9298ace2a0151e6dabff6ed393498cdcfe5fdb558a19c6dafa99a81584ef50850
+DIST firefox-78.6.0esr-ko.xpi 567529 BLAKE2B d0fb575af603dd3a32d128375fa3d571cd724ab3914daa1d03963d93af29d7bcbd109f175be4454470a3c5dae905be9b357240c407f16b531e6e59abac7b6f65 SHA512 fe7474274194bbc0ceaba06ec5ee240ccc322488f1cccc41640925fa92716e4a053260ef68e85d12cc722d01fa82c3e9c5ae7c5fadab8cbb5e890ffb45fcc48c
+DIST firefox-78.6.0esr-lij.xpi 475234 BLAKE2B 5422c34dd716b3fab1172788a7542e36cdf81c7650ec03546a60b1f6edc69a4e1b3d6106e91a9c4c828e30f8ea09118232a561833912d0b3802427da5f16e6ac SHA512 0cb6f671157a8f172df0abb2d5bc1c5c067e51f77292d319b0707175af01ad4498c1965814445ec95d763880a6f9515e654c5971ce85ba695d9af9396eaf0da7
+DIST firefox-78.6.0esr-lt.xpi 540700 BLAKE2B a59e1487a37b6287186d77b01b8a5eaac82c8c675163d5ac3eeac9f8fade6713fddae9bf367d3840ff3abea2766e54edd7fefb54513b236a722135537a85f3d9 SHA512 56b9fe83c696664219adf69982dc7218b22103bed3463a505cdc95badbb737472780325e1c80adc3f975d93ae750ade65981e0fbdbe5be29b1b569944b05a8d5
+DIST firefox-78.6.0esr-lv.xpi 467469 BLAKE2B 5c73c248c6a0b42db92e3ea50a0c48173408e934c8f7d0d6a4e6e6e66a69cacc94c9d1d0b3121c09f84fd8f9cefd2edde49bc9ffccd694b225eac41810fc231b SHA512 f67485f05fd44a285ea1bb19cd6f089d827803072ad6a941090c8d233e751e4044e51a2fc1acd7732752b3da9e8fd67380b0eab5dc9b73d1f94c50532a848a8c
+DIST firefox-78.6.0esr-mk.xpi 460020 BLAKE2B a6fab7296ecd7f53affd5ba459c09d3fd60d97131d3e381621737cb44705493f93fadd526fdb7d0b71192216828a7d2c7354add19f160c58c5cc340f8ec46b3a SHA512 3743d9971b922448b86a9bf9d3eefcd68a73e8d554c49aaef580f9b4dcdd9b46fa8bcf21602938f51cae192aea16e9032a99a68ebdd890014c502e4f720a8b5a
+DIST firefox-78.6.0esr-mr.xpi 541578 BLAKE2B 0864f309366387b3372e79a2a36a7705830637c73c7f588275cb423c41cc7a7ff58c55ed1fd85f704008e3972b24d50cfc582f850725138d282e23dc99caf3cf SHA512 65b62ca0746f1175d24c0f9fab649314be63b8d8e05fe5c14046e3bdf291b4d914f8cbb60350dfe7129101d1849a018349c2a9ffdd18e0e633406561fdb16140
+DIST firefox-78.6.0esr-ms.xpi 453061 BLAKE2B c06556eaf7f202fbedf9debddfb0ff3ed17102183ffc44f69586274b699fb2d3a5bd386e3df9fa8be11e54dd619b5854ba9eb3b1aeed1c3a683cdf513f89b84d SHA512 d29324a64871cc4d77b324709917256cdc42f0aaa0634639e658ce4c218d98c43d166e2bea5cf0b2239c688772cfbb0ce609f7cb71cb62fab6270190cec3d1b8
+DIST firefox-78.6.0esr-my.xpi 526339 BLAKE2B 9f780e87e2cd65ee598e6f75929446d2e376691db9fcf4af2d8a39d97c0a0a8721abeab3feaca5e453262b879614dd34f37dceb0ee2d8f220553205e96a5c3ae SHA512 d46ba89a2c7571b5e00f57cb6ec0087238cbd4e3f542e0c4425f3a82d3dc5797f064330fa732abceff8df37836f470de8517f9f994162a959d856f890efcbab7
+DIST firefox-78.6.0esr-nb-NO.xpi 518523 BLAKE2B 91b3c3e6403cc4f6a88cd9f06b15766fdb561f13a3187e1b46dbac05bac65348a3e13a67d5255b5ab73245b08d0b92f67638803e81a646eb6eaa34f1193a34f0 SHA512 edcedcb426fe0ca706806a33f19a0a7ccac32e8b5f61861ca5639c305d4d86b3b83eebae98e75af59d83033cb878f6444b589906837292d25a4846f1cb570146
+DIST firefox-78.6.0esr-ne-NP.xpi 483419 BLAKE2B e20a4c02103c76f10121fe029dc7385daa1c957bbb1ce26ebed0c0b8f6d02848845883d2aa389ea9015a3c750ca837c3b7bef0866587f033bb6911f8b8e3d86f SHA512 9d55ba17d8bf185aac2e45de6204ae903e33a5953cfef78e0f46bd5fe9c88182d70380d7d212a49e229d54d87c1b45d6b127c005165f0e94ac1314297ab1ca00
+DIST firefox-78.6.0esr-nl.xpi 526208 BLAKE2B 9c4e70888eb1929e653c2a020c81b0dcba736d16833da749bb7c9f45c2174b8593aa8111e9b1063d774c5bf0271dc202beb0c4390ba856732759ca1c80c3c53a SHA512 3122ea673a0f2d24f789076bef71848a7e1d90ac6b40b85904d7072a5c4c11e0876959e30e38c525ba2958e96095a63c788c8c2e81354954e9e9a3080a6e80cc
+DIST firefox-78.6.0esr-nn-NO.xpi 520168 BLAKE2B f550fbc5c2cf1cd10f6fc60bb9379a5a89f53a144141a99b79d6410eb7fda71c4271ffcdf0968a9ba8ad105b55855aec3766f23c43dac6eec64508a9ade091f9 SHA512 8bcbb42f799b9f221954de65322b6e3a1bdd8e2ff91a624e9cafb28086573b0671b066b552e8a29f0f5213b367a33c9fb0d806038272f9dec6eb4b19c7ed56a4
+DIST firefox-78.6.0esr-oc.xpi 542147 BLAKE2B fbc94f5428e513b1fe37e4bd9bc883473e4bb4180eca53bd07115b5e3136f4ce7bfc4dd1d9516bb73a2373f8c775a413c981fb7c4b51ec61573486ddeeb4a9a7 SHA512 213536d1f14ad15d07eed1f991ad5c9e125f4f6e207ac70319393c56c1e4ca083c9bfbaef98f95407f1d30211a532855002f0cf2ed0f3ea90a958802fe06e338
+DIST firefox-78.6.0esr-pa-IN.xpi 580353 BLAKE2B 966537e3ea4bbfe6854197dc77fb83412e21acad194eb84ff263fcdbb964540afd583dff05589625821591b82100db551b82998fdc5743843174daba4937b068 SHA512 25706c4ac9867989cf4b86d3995947e1f343dbbc449cb60c0b254e6623bc3939138c27e473251f2c63eb879e46256e1d8d2634991458073c7d64babf27b62ef0
+DIST firefox-78.6.0esr-pl.xpi 545607 BLAKE2B 3bb2ca274c36e216eb0b961d70cac168688c616b1cbdd30e343b521b469e0b7134e2f613d8945a7cf8e8f0a311bf3d3e7edff93de8139a3083613a7a1d73f2e7 SHA512 eefd9914b003a5c3a0652e65968a2f7bae9e882f94bb4a4289a2b4a55a456f647b7cf8cc9c3182aa70bdd8b9b3045fc8a8dda0ca023f5cccd08d4d830a290f36
+DIST firefox-78.6.0esr-pt-BR.xpi 527569 BLAKE2B 4a45298aef23ec32925cfc995ba399609285f9692848865415f4d22042fd19529551acaeec96c0cda214f22dc055ac980932f55684ec26a20fcf7d64276cde19 SHA512 5fed281c22cd04c84c441fdb9625672a5659365fc5c6d12a820963b8451ab1b6a080162323ce0bb128e4a446dd75b154b6a4f86a71723f27f27465d6bc6d1cdb
+DIST firefox-78.6.0esr-pt-PT.xpi 532038 BLAKE2B db14188ed6a1e8d4da0c3a1aa3516c2af0c0f79951118e519a30f26498948b4d8aae8caaf3fb1d6973c62b4f062b4cce6bddda2ff290347bf606ba43639b6b17 SHA512 2930c49b06d01c4d831e50137934ba8ffea5496ca3015eacc8e05c5bec408f84db0d021688c1abf4269243fa87e4675d7a6bd01c1d3f30957759f38c9308a2e5
+DIST firefox-78.6.0esr-rm.xpi 526718 BLAKE2B aa4be7fc1759a99e288daf232fe0fa8a46237a11ae52055d3ac276716145affc0dc928edd11124e40545b0eee2c8f32426feb43ad9468103e57dae9652de8d8c SHA512 96ef163bf5c6d1adaafcfd10927e57db92fdf8148cfdcb0b0cd90d275fcd4d197ce302bfa75af9a4e46fd37a97fabf41a6cf46de33e56b3566456f5daf8f1ea6
+DIST firefox-78.6.0esr-ro.xpi 535577 BLAKE2B 00864a60791b902b01afad88a459dac4210fadd5565bf5a640bdfe19ab1a7142ad92abd50283f2a47d35d0dcb206100133413cb90c195a9908d389f47d9f1e03 SHA512 0573c5ccdd4c2fc8705b2d8e2bbe296655367c634734d499cef15b20bb0aa797b9cae317208261a9edcc9d195b59c7e0b59e459efa5cccd722c17f7f42567ac5
+DIST firefox-78.6.0esr-ru.xpi 614609 BLAKE2B 3d4dd1130c4355c60cc4a02e2321b5dc9b227e9c01924cddb27bebd1c5ce932c495d351312f61b01c3dcaeea7be84ebd4da3ed5c075861d75d2d3923a86b4afa SHA512 a4f3b7a0c6b7db43f91918eeeb86a10a466ac8db31bbb482b420bcf0e873ae8252d9f1eec0da6de3b710fbc4d62922f7630db2bb1728d4d36d479d561ed32182
+DIST firefox-78.6.0esr-si.xpi 492524 BLAKE2B 9660f01ab1c17d4123d819c799b22f7ccf4209194981ff8a9f54686117d3c904f212a717ad5578787b5e83f2c6ff9f9e21880aebe2c7357f145ed58fb7708fdd SHA512 dbeeacc5f6d770b0ad1bd036bcf0cd4075ce29184f944f093d55e684928d384fba446e1a1b059977956325a8c391e9b80102034af41facb0fe68fb69822ec409
+DIST firefox-78.6.0esr-sk.xpi 534225 BLAKE2B ba6956a8b3b5c41697fba77a0aeaaedafc828024c8ff85b3766ddf74587066c0b3199e29dd610da4d10472828506c150a922ef0ae72f21462291fd0a3db4fa15 SHA512 142eb907535c78a83c16717d747a12182ebe94886e90f04ce5c174f606fa9065d5ddbf9a19dfd5037dc5907c7ce439e54b39fa7b9cdbbeb320823e7e938c7355
+DIST firefox-78.6.0esr-sl.xpi 520941 BLAKE2B d46077d22ce722822d6e95991e61b2d30ff4a058d4f0a215b9fe7fcec95503595123498317e61967bc89edf52b6b6a4e1097fbff0737ab5b9b1fd3911cb36727 SHA512 7c0ce61b7566dc0398c3917147011ce0d4024ffeeebcf1180050bb11a7ed94e46461b0ededa6b48fd5a15386deda40af72365aae5033b74337b1b7411f0a9c1d
+DIST firefox-78.6.0esr-son.xpi 424586 BLAKE2B c1b6f14f988b592e7147d6317439bee8f6f5d1339b7c3d728d62be7a19bc4324ddae28321d432018daa53111348b449a56be5983124df8db995706d4e805fa84 SHA512 128aaa2aabd6d5583e55d2b382c4866a95bf7174a8f4398876f9deb63cc65d5e6a0d129300e559e345c2c1496797e38db065c05d14fc7bfef52fc5fef645b05b
+DIST firefox-78.6.0esr-sq.xpi 544905 BLAKE2B 68104a44fff0ef8a702d63c6dec475c1606eaa17fd8a99e2a554a873a3544957d93d21744c0d42a2347153bec1e31d9ba52c403023306919a6a4a7a6f39500ce SHA512 c355101f27223651eee207e444c908a8f6e74369b18cb0f0711836cfbfb398e0332f31b45c42bd5e0be283c86b50dbe9c3caa45ee982a4927d015d57b44d4d13
+DIST firefox-78.6.0esr-sr.xpi 561373 BLAKE2B f45f471f4c2a53e8eb881e120385a4523941988da5b4358e36206af0b9b5532e4c389f8350121eb4119ef855165038b2def6b16fd12ff9d08474fb222d1f31e2 SHA512 cc76c135577b505b527d7c6c8dd7f2f98e0b80f24dc4c12e00bb2db9877ca5d9afb4a1168ceff484c2471c84de4c3d63a31621802bd43ff78da547daa252cb26
+DIST firefox-78.6.0esr-sv-SE.xpi 529703 BLAKE2B f52679a45466ce11cc99e05eeb64beb22063ea6e1c924e8a9e79a7669ee850f30b18be2a0860581599afba65df9ba23a648da3aa6af168044a43eb6957446539 SHA512 b54649a444c5431cf434495eda36c31ca3de952bd461917cc5e15a2f41232c78ca843b2eba3b7980c1947a6c7302ba91cbaa9d8608f53e30dcd1978c71b47fcc
+DIST firefox-78.6.0esr-ta.xpi 521530 BLAKE2B c6743ce28e0649ada85862550d2df6e9e04ed171d9416c3d51511b1e3590eff42a3333a53e1219415fab245687ceebbd2ed9f9cea5c32b5676eed51591f9a212 SHA512 f52c85b6ca6b5eb285f79bfaef4321bb134d4a07143ffa0cb0b041e0491fed96dbe0777043c1b86d01c6ea4f951ee1f5515361c5a4651c5e494239bdd3786e64
+DIST firefox-78.6.0esr-te.xpi 558415 BLAKE2B 49ba51cb730bd7e5ed2aa5efa3c55f8bb35a7300edcbd52db442658b3d5628bc824ff860a9c16fb764580d26fd9940894dba21cf3fe402c08e39f06fc1094e5a SHA512 cfbe50e26f4a6f6da1398e07edc0b1565230d5fd7ba69b4e7e3f508d845be5d0d8fb3f4250e03d2cf9bd5b69ba1b2d4c54f759602dbb94a5540aeec51e5598fc
+DIST firefox-78.6.0esr-th.xpi 592236 BLAKE2B f01aac98dc2b431f829b0a81119158f2dccb323c7ff7a094021c04c1a0411bd24d2affba9399e1b6768d89e576c555984f68dc7c16fae5fa1f8b9f74a002665e SHA512 76f2fd8c616d04aed8ac06918fa4292e796980c4f48130b6678f5d061a487598498c7c1da7b58abd99fc0a30e5bcf3c9958c332723e2ac5fe7a860c3292dbc16
+DIST firefox-78.6.0esr-tl.xpi 521106 BLAKE2B 42ee5a5f62b1c7f12f8aa26a8918fb9585ed7787bc560bf0f13684f67274e6aa0f55ec0d063f0d6a892bce42658bc3811aa51aca8fb8db855170461a4791f724 SHA512 082ec4a3c1dbed82d32871e85bd0051113b99553303c955a41e63965739b3ca679fa7f62c21f463614e78aef80048e30330ed152fbf8bdbd9154e22558e7245e
+DIST firefox-78.6.0esr-tr.xpi 539861 BLAKE2B 601a0aae22103ee7637657b2f3e092bec8353b226b86982e82b98da8e1e9d80de17048f38567e7b3e49fde38d18e598cf07c23b9e804876053a7c89d7aad622d SHA512 4e23a5d4f97fb856b6c5dc4bdbdb444217926de8ffcd1d4a53000de77e858a476b9353bf941f33b2299cf2b4f9ecf63c0792e3c2373a47d276f1cad76895b544
+DIST firefox-78.6.0esr-trs.xpi 501215 BLAKE2B 1357d628a32cc0cc52d59af3bcc56bd7ccbe36868feef8d3c8ca6f9420c448d1fc7e689b0bd7369b7760040d16750317ab4deba7bda0c4c389ddc90bd6a1ac88 SHA512 3aef0dde430f4786ef03559b83fe633b82bb0413657c61e005e5a13672ee127ca87a77a125ea17c30e459aab66912e9a5c215665c1cb32c4c7e11723ba0944af
+DIST firefox-78.6.0esr-uk.xpi 608588 BLAKE2B 3e2754d8b83713963b01cf277729c7b94c5b1d46e2756bc2b6e7846e3ecd6a7d203c0e8cb95bc80733923286fbadd46fc8e2c92733290c70b2b729c439316f15 SHA512 7ae8445b07a6a5bffebf6fc3ef1ee1b19bacaf2af0979408bcc0b143c1ee08d8d4a328835e1f030e047873fd35d4118a9fd4d63ccb6cd76de7b4580f4aff8dd1
+DIST firefox-78.6.0esr-ur.xpi 557952 BLAKE2B d2a58c7f780afbadbe19de5b991591cbc0dbc5a3b0bf49dbdd4f51bd7d20a0acc7234b281b033cf58b2f3b61ef52a0b5a7555e2bee0613e5b040b639b2a8e8b5 SHA512 af9efef7ee96b9d9cfb3d06e8c6f7bc81cc076e15edeb75d3b9f1d32b8e4e3de3cbcdf9e383e8e21960fb7e5e973274d280c9fcaa5e06a6703ba44da0a3211ab
+DIST firefox-78.6.0esr-uz.xpi 477554 BLAKE2B 982b0c92785e86e2a74e6bb5fc16803d485d2dd4b99a65917d438ecdaf46478ac50ba8261043dd431519be1114c802ab32e917792132f8b1fb58e93242d24c04 SHA512 1ad034dacb33c57cd22e573c6742d03ddf71aef57ad93e5ab31ab456aef8794d2902e2f229cdcda600e604239b8241662b47af40438e8d2e8c095ba135f9becb
+DIST firefox-78.6.0esr-vi.xpi 562855 BLAKE2B b044389a59b2f846596009f9eb7dfe08e6445d34a65e400e1e792cd9430a59b47d8dad19aa54b12fbfc867211cae166d582574976d78689cdf0cbb2782e31150 SHA512 aa61cda16ee1be44ab909ade183b56120fd713bd13014b9811775aad4fd9b5a530a0ef341b9522bffb09c6dc1d9b6358b260a00907b8e954f0af3a7c65ba137e
+DIST firefox-78.6.0esr-xh.xpi 427847 BLAKE2B 4cd2c5e073201dea0c1b2163e3a9196345f6eb542790ed8b2147a148a294505f46437ee084b593be406ee26c008d89ecae37454334aac9e5ab66b6485d350957 SHA512 6dc63029388d03d3094146105fe31b2ca7feea2dfcc32ef6a0d3face10788806b6309210a6f7ac63921390a6972fcca1a0c034797d1c872ddda82fa96b12773c
+DIST firefox-78.6.0esr-zh-CN.xpi 564765 BLAKE2B f275015ee431fb845dd6cd7e3d77c18362d889f5edc618fd24c78267871c284e7033dcd08894b8f0835393fd4fd4441b3c2bea109e3fd6e93f477ec5ba0e33a7 SHA512 1be7b1b28e0d6c5287b42f3c57c0576475140fe4e9d2a4ffc8075aa72a81b92a835c7c44b2ff8309719bf9e290f5447bf6676ead1efa911940437c407606c132
+DIST firefox-78.6.0esr-zh-TW.xpi 564720 BLAKE2B db85ce7cd1802a7b609638fbcf2254b276192dfe28f5ef874baf246786f9f55098f04c6260cdd7af1a5482dc2db0a202f879e8d59ae13d1c739d289eb19c65da SHA512 39fd8d7c16d608040f6e0823a2b221ab0d02a3265530ff1058707973904c6a92f8b76db6fe38d3a7ae7c8bcf834f9ed46418f92387f88b5466541e44b964e5af
 DIST firefox-83.0-ach.xpi 463987 BLAKE2B 2173c637ae155ec474d18250adf8cd67ff7732ed9ecc7533004296934f82dfdd2f83f5f59dbd6b095b519bf5d3caf888f5e07913004a27771a13376ac080978d SHA512 cb1644bb1451311923bcbbbafe727fe8b35c33cf9643dceac603e802b82a2684451f9005ef6bfdd1ddebde01548926eb62dcd511e1f8a960248ea5b74f5f72e0
 DIST firefox-83.0-af.xpi 431349 BLAKE2B b4f912e706b464728e779bfc3cbdb7304bd763c55347140c32bdf309b3b4869ebc4bc1433f5cf5c970774f69aabddc4b5f5fce568dc32c50c4aaf90e9d07e13f SHA512 076e9084ae00dda0cfde5b09cf2dae7ed8994543c8de645a70b2f116d01da9e024159114d4d6ef21ce134b7d7cd16b95678121b41300ec5174a36112d41da4ed
 DIST firefox-83.0-an.xpi 511284 BLAKE2B 0b6332b8dcb254bf9df13fde4e34d01c2ef6398c329cce630a0b05a91b1f4ef02c8177f1726f489e8526ffd9fa9e822a010bfd6a669f5a598e7ed60f8328a278 SHA512 43559e760a96092b4c4bfeab6830f021e69c8c7c56a187f49109ea94443372e6323d503f1f175df1d77c685fcbbab2077f7fb02dd031804cde8a7dec2aa1d988
@@ -188,7 +283,106 @@ DIST firefox-83.0-vi.xpi 563425 BLAKE2B 398adc06edd315941a71bc290f110aecdc5d04a4
 DIST firefox-83.0-xh.xpi 430120 BLAKE2B 5cb1701736000f4404ce780c5aa18eb37fbab3841a92e744a2a847fac271bbffa176eb8032aab05482cc2516052f48a785547a052219e82d08d588b3f45463b0 SHA512 865c2f98ca387d3dcbe0be4285e6f0de902766cfed3ec23c067045c7751117461dfff785afee9c26171591359d22cca4afefad6822a7b78d48ca7c10b421ea86
 DIST firefox-83.0-zh-CN.xpi 564100 BLAKE2B a9b89639386f0775dd1a6ab99551a2e79fbafa66801c6252084659f26dd7974d0aa86f70dcb404e5dde43deacb584c1ff19393302200fcab726bacdb86054c16 SHA512 c41654386aeecaa7691524dd563e07235b8f5962debcdbfe59a586292ebce3086a275c47873678d788462f6a5111335cb7fe0d293d11b4585ce7ffdc69a7822b
 DIST firefox-83.0-zh-TW.xpi 564079 BLAKE2B b985bd680dc620313cd217beffa87935a546e528a37854fb20a7f4cdebdbf50fd4858ac91f13bf31eca947d09de1a2a0b9956ddf5acb6978e3a7a7d8628be0c0 SHA512 d5eb2a32cf4a5dc675adae6590c5201023387df9a8854ac4814b601c413c3785ae2e694dc5b4d231e2d1686b386cde202066cd2f11c1071dc29eff81c51e3abb
+DIST firefox-84.0-ach.xpi 461782 BLAKE2B 1bac57ffef8d01b3ed496a0d50e145be3c3a9ca86d245e2d22b39146d5de338a92c83c4857e0d67566f25a1ec67df4cd18b35dc4d56586edddcba56ac7c0bf32 SHA512 d6cb2b0d5e92052f5be6ecac1c997f6baeccc2b6f3d99172813d40eead384b12d1b2db0d11457c06f2a6b31e2ba2d1bf3b1369227b0270a82100a429fc0600a0
+DIST firefox-84.0-af.xpi 429057 BLAKE2B 1012416bdba36ebc227785e837b7108d720f4ec179c6b386e232809454d5f7880b1618cb23cf92473a3a7a5f327f062a825272c5cdf677ea869496a63b76c8d6 SHA512 d8988a632d64f7a87dc16b77e9ce122ece015c9c03e565852a30fd59af5efd2d773f981fee89787ec4aa008c01aa8859fa9d93a9a294090863e11725780fdb02
+DIST firefox-84.0-an.xpi 509100 BLAKE2B db0884e1a35c467d47f29f4ad9f3492d7d6116981a8e5ac6bfda536f7c19c91ab02038c47e64e9aef0fe75252b90d00bdd4a5a33a1c873d2eb0b17724ced259b SHA512 0f6dcabfc98b3a141c72e7fbdd9bbd272225161966ed6732b8f2cb92e425d8577857d6df775aa7358a3278040efae7b0d5bde6dfd446f66719267f4c62f8eff2
+DIST firefox-84.0-ar.xpi 560411 BLAKE2B 48dbfa8b0848918c07efd85d7c770ab1af14282999af95aa038890f9b4a9c4c179f1fcc6510ccf8fc08c74dac413274d8961bf6afe87069355721f75ef31558d SHA512 5dc06fe1cca3398c609b17db28f678eba0b6af5145a90cf64f476a4df045bacf51b802639c876968fb93531945c0f5c0e5fc06cc248385f26d3f9608405155f3
+DIST firefox-84.0-ast.xpi 457474 BLAKE2B 9b1afd4add9c46b6212799b69e3ea5668ed1db4101621a77c0cbbd789e32122c3f82971d774dedd7ab46d0d3855a8ea4de15612f0ba7f392bd85c5fcb6fb29ca SHA512 3399145156d6a3f0825dc990185e15f6df8967a46487673b65f7841a589afb2bbd6da5185e317ef46f906bdee3f4ab5c82bd2b573e410d26c62877d5467dc917
+DIST firefox-84.0-az.xpi 498631 BLAKE2B dfc41dd5ae0c6424a929bcb9375a4ef27ced0e2de38e3a1187e653f13138240fad651aa29b11578ea32436afbdd3dc8056c060fd2a7a5176c789c67dffbd9882 SHA512 420d6305ac6c09dffe14f98abbe809a5093491a22b6ce32b45f99d748a7ed42be39cd40249d1cc22231e3002d3b5eb40cba5c90436281361aaca8a374b0461b2
+DIST firefox-84.0-be.xpi 606511 BLAKE2B b2ac86f375fed9cbb72b91121676e0cbcb615ee3a81fdb286595c155301bb4dc279e04aa86da9eec35afcf216d423bac166ca810849797be9f7062e9426d9edb SHA512 3d2348105494fbd12586e473c107af7451695c77fe67ffc17a7da985018fbf83835592c0e8e9cb0622fd346cd5114934bb080fe8758fddc9cc8400adeddbefe9
+DIST firefox-84.0-bg.xpi 556439 BLAKE2B 0728aad322800ff889053ae901e4216b8888ef148b0972f8fa4949db94468afb343469d3e3663f67379620384365d19c72ec01ea84b6f69e34f6daeb85ddd720 SHA512 742bc780b64f3d572b481297bac97eae3d0432dc8ba0e8b3943ab4d0dce6927d374aead24893362300e415243ac4463e349b79ed46cdb982b8ba6342589f8e26
+DIST firefox-84.0-bn.xpi 573370 BLAKE2B d9ebd4f6a8cc7f90b0d637b026d3e1115dfc754e41c6d5ea99ad5c4d054aa6825b4187c43f870b8d05ebc075922286d7e040f9ab5e78b184c4864765ef55aee4 SHA512 8771037300c3a2436e1fdfedd63c9477ce9d00059d30d0a8eee2bcd76f2c66baa412cb9eb49af2a8b4704b3ca2662d3d08003d3b738a82d3296ba26ff69fe92e
+DIST firefox-84.0-br.xpi 514065 BLAKE2B 216d7d1c3b1f6f7089f5feb8c04f10fb82faa449be6e9c338a108495b9639bf89d27198b5236e79121907d498f50120e4e535fb135d1dc6bc1cd5afcb006a609 SHA512 bd4374c8a31d1af2ec15271f99d98351fca4b3421cdc94cc544f558344a47642048629bf17513a9030bcf0f79916b4c40fa105fa9d0abb177ffb2512a73a9a8e
+DIST firefox-84.0-bs.xpi 465256 BLAKE2B 58013792b1b27f9c013269bf41ba76622e7881049c1ad1a641aa228aa1d0547a821a2acedbe1c5c588713ba865cbd6d00cd5f26071f1f0b883caf9000efa891b SHA512 6755560527ba8acdd3f52f3c25088c746a0569050b7fccfdfe65a6adcdcb8f5b5675f99d4ac4ee2993f17cd4fce48514782187dbd9b1a97540b30dd91e71afff
+DIST firefox-84.0-ca-valencia.xpi 518013 BLAKE2B b94d887158d7471c0e5239387e0345c43392c0e09d822b78f7a661ca9dfbb097b980ddc0fb720ff95354cba338e966d7d3942bcec8234837970fe3e3b023fef5 SHA512 67664298356455d65b8eb8cc20ff3c11814317b10d7cd87f044394050ea56ad2f5981a3fa80cce7ce78306d415a8afd9d5f4bfe7e7ade22d0f1aa571cbf2d04d
+DIST firefox-84.0-ca.xpi 516050 BLAKE2B 7b9459300201fa9494836f5a8290e0face3dbc11a7ebcebf9f947877777807eabf451a95943034f9cca9c8538c4184b060ebf401ec8abfff80f1af59601e73bd SHA512 d1ff68fb2cb9fe720fa03acc196c6377b5aca28ee9fbc1adbe5d5af17894296482d03e2da67cc9b021cc506fb1206a51f5d26221deab8f71485ac3a2c5e890b0
+DIST firefox-84.0-cak.xpi 549476 BLAKE2B 925b9c0f0266027be178a1fd552f3257332db7fbccaa14f6b70f85b073be0634c2cd5470a7a078f364dab7f1663807a9fd37fc065f5df6fc172edf0915402c27 SHA512 450dcff7e3508a3aeb43346e33778cd25e790469a8ebce157a43cf0fa2077ff23f38b770076bb6e2dbf65de5920804f965e4b4849c186941a5d336690960a2ce
+DIST firefox-84.0-cs.xpi 540229 BLAKE2B 48a2d0e9ed402dbef636855ec60ceb595e8c0596f9080802871773a239b9d452af9eb20e7d64358f22fae145ddfdeeaf1de630529f888688d3f6c6a0ccdf920b SHA512 c500e273c84592d429a61b77de58e29fb41fb5086b5ff8c4aa78e7a28116153b9095a5843151a47e07e9caf07f71c5c769ef486eff82e242761d27d8feb5eb75
+DIST firefox-84.0-cy.xpi 528799 BLAKE2B f7882ad21d11030d071cbcf845a5aab45ace1c834d3d7a197ecaec4e36d2711a4da4cbb4aaf9727b5a879013b20b5722c6c910f0055239e99aab44ca30c345f1 SHA512 cbb7e024ba271a3415b03e3de4461a25e9e5e3c79eee8e5acd76c6d894760f7a7e2cffb6df5f000e86f8b54822ddb6106eb9abfe01b61dd253d2ef7b94dd4df3
+DIST firefox-84.0-da.xpi 520967 BLAKE2B 63cb51683c2e6267cc87d20eaf64c354afd944e12236ac1a457a31988e8d794473aac4ca941b53e5661dbcaf21ba07b207e588cc71267505a827586705c7fa27 SHA512 21010a042d1dfdf8cc7d5bdc5926e8e2e8ed9494626df6c199789db5cb563d327470d23ef5830dd26c1e87e0f9bbb3267e5c98585dfd92a12554e7d27df3ab68
+DIST firefox-84.0-de.xpi 540874 BLAKE2B e1dd09c35f4c604da64f6a9f1a2771c1ffe787d7e18b30564febc21a671ecf1a924ad2c70f3e14fcbdc5d296efa664d26b8f9bdf47933163b3686bad98981d2b SHA512 00c0db131cd30f377ce67a03b2d09e974f73b2e586d5e3af000f37bd5c73526c0cb2a6203d7c592050d8c2922697381a20f799d217d199bc4df9a2f7d4895fb1
+DIST firefox-84.0-dsb.xpi 552201 BLAKE2B 0374a59dd0c74e3257aafd8b8068fd8d34ee9a9832df7da48077ffdaea9ce497031b9c5f2d6d2604d06020091f8ee1553d4cfcf0ca38bf3d7b684be9c3d4277f SHA512 f432465229ec3831b08b2607f45d13eac865fda2e607b1de5321084fc037e25e801742e2082fa1c6a2163ca8905a7443de1d43d61f9fa9e56558667f33c913be
+DIST firefox-84.0-el.xpi 623763 BLAKE2B 73886af39cca03a62f37dd999831f43cd6db5b8f68bc3b26c04e70bf02ae66a882b55e4b667870cad6614f9818f95bdf18370b5d336f95947e1a579f8c8115c5 SHA512 42a6593bcc27e02cffa37c19b6503b27835544553472bc6dd155bb80da281281684baafafd21b4c544ec6d68cba145bc226e3be2f75932e488065f6a26932493
+DIST firefox-84.0-en-CA.xpi 495288 BLAKE2B 4318e0f830f3ad5917554a6af1f2f807cc1679bc4908b255c1f714255f52f12a73b1d13e18d219eb171161bba5e7ac55b835f7463cc609d87ae83e7db62542d7 SHA512 99638fb05a89b857e83fdd00590287614460868e3b00f52c6d4f3f1d3ebec6a7a681ddc44c51dae89dac1f3514d50c4b38136c03cde2beec4ed5181e0782a202
+DIST firefox-84.0-en-GB.xpi 498699 BLAKE2B c12ea859249888c933469c2d95d15c487b34ce5b5f8c85d4aab0eb399bc94aae793a37e1df59d5adf916cbbc6ce218c96f1b23062c2fe1059d95213c94ce0d1b SHA512 4866d4c787784fa568c82045f18a46b4db1b1eaac9c618b4f0fbb25251d69d19b3dfb5e2fd104b12d364b14f154e6446531585d6b0fa3c440827911870fff81e
+DIST firefox-84.0-eo.xpi 523253 BLAKE2B 51fd21645bcf758edbba26e7aba4669ef3fccd8a3e706a853789a1e45896232b116b7a93bcb3f9e988efc47b7def90de3f7d92352ab4cad1a8917d5698ed7c46 SHA512 a1177a53cabdb4d351f47a878ae53c84434371eeea68d95313985b2ace12d9bee84c50f1fc57bc458c7d792e56a4b2a921041f356ef8cf01506bbce14afcad1a
+DIST firefox-84.0-es-AR.xpi 533681 BLAKE2B ed55979ab94d23fd755ffb1532e4dced7d96c8d2aee8dc344705dd84be99128a27ae6e1bbeb3100016aee62e5acc29eedfb4d9ebace7c9c271e05190dfb0520b SHA512 644ceafa73ce6c9962056c9c5cb45dca809d9feb7cf2a003a780fa53aeb52409ef5c2a2c2c25372252544c77e74aaa8f665ec53cc4f0b7229c38659af11603df
+DIST firefox-84.0-es-CL.xpi 533171 BLAKE2B b0acc069c6826201c52a99353e0ad4974739ebbf35cd899cb9446263cd67c65c11d474ac161504a5330170d28c52f88e781dd367c39d16eaeef076365651eec1 SHA512 42c9bbd92eb6c2511bb73cf25b9e44d14d51aa4e54dee84cd1621a98e9fb2d8fc50ce84e8e6a25cec724b98d97df5cab9551e8585130d5891b23f1051795e9f3
+DIST firefox-84.0-es-ES.xpi 523073 BLAKE2B 64be1530e4bc75874d2aac134c639ddbe342252681ea67e85761b272da38e7500958b7eb451c113493d32ac4e10b33d2f25ba77f8dd1c998e8c96a54a6f6b21d SHA512 20a90c0a12a80a67bc4cecd9910381735c060276f935f3fbce7bf48580f620c196d695057c79b6b87933c704898669d988dd937db80e3c7709a8965a18dd9050
+DIST firefox-84.0-es-MX.xpi 531350 BLAKE2B 80569f82c683b7266901611900b154a575ffe881ed4a2a1971073353ffed91b94e07af9f7074cc2c4ed19dc1a64fbdcaa24f8667aba1abcdfad66d26cc7891a3 SHA512 0cc1330f1a483704b11566c3962b62d95cd958770b5c715ea3720cd6a6dc7db2fbadef4dc300bcd8644be96494e285d13a2603f3c6a3715746297fc85bf0979d
+DIST firefox-84.0-et.xpi 486946 BLAKE2B 8c5f333fce164f9f3ef5030bccf66ccd1a5ac9064c8c8d4cd6df7054017c3b85938c2e7b735c6422fe6ee9c40678b9ec0a146ece9f9446cc754f374ed082ca62 SHA512 f99db2fa9dd3228057d63f7f69db495f9b72b51437e5cf8a6b4d83e1f14ebce07b28e6397c18287c854870393fb3e618ec84d40a5b99050c778525f66c4ca78d
+DIST firefox-84.0-eu.xpi 515146 BLAKE2B 1ae5559e38f695bf6b9252d8b44aa9be6029cd2735152384ee6a8957c3928b6fe892cc729812ea2b7cbf019259a3a5453659256dfccce07149fc4a763ef6b071 SHA512 7f9b0b6d6da854b35c968155dfe85b60cb80627fbafa9d63c7176227d477ecdbe1022bfc777e2384cd663034942a34c6df07512e9a9cf729b7f454a434ccab0b
+DIST firefox-84.0-fa.xpi 539667 BLAKE2B 7cdcf793c157c9bdcf3225da266b15afddbb557f8e0488c77b8e33c6f6de7140d7397dd4ff9b82a974f4af036b80af4068a075df6e7d81679707c5bf2fc17367 SHA512 2cefe4dc1c9111619bca82170b013770d8a90a1a0c3ebac2e7f508ae00b672caa8052ee8ec18c387b5e63bb7c277875e53a5942e001c56527ea1110589f1891b
+DIST firefox-84.0-ff.xpi 483203 BLAKE2B e832ebca6fa0712de669aa59bb5bc1439bb022f0a577b0f337105d29586f9c259590fc789a01f3bc423a967f404de6cc5ee16194cd6a006a3b977cb25ada6ecb SHA512 beecf1bd971370d44053ce3e4eda1662c0850ccf8efbc970a6554ca5ba6da159501731c4f3f3d2cd635c5e32913094ba877995ed4c794c00395cf0906c13203b
+DIST firefox-84.0-fi.xpi 520036 BLAKE2B d0fdc5e0173e69d5028ce2956c007dc9711519e56fda21d226026f89af7685e09cf28aedcbf27b1360eb1757235a9010c7b5e2e50b859ecb82995b170bd22c6b SHA512 89259469879a318da43646f9ded2ac4e37715017261db67fb32567e2819f8c2c1f1f182639e92b586dd525a1bc850ae7f428b7dd52a7ea6e74d76420e5d915b4
+DIST firefox-84.0-fr.xpi 544360 BLAKE2B e83126d3859fb10f5be862f41745719d0eff79bef58086759c9079b658f5f68173301855e3bc21e2a438869e8040b0fe4b0792eb54b19d5611054105e224e5e6 SHA512 5f860a0614a1565857fcc2af6a2e26d47a0992d28929f737ab74f787bb8b0dd1b1258d784671d0dd58762eb034d6d444c9eee1dec06b3530baf1206e16c50594
+DIST firefox-84.0-fy-NL.xpi 530310 BLAKE2B b665874394be0632d92f98c316d14ced7f2e4867ca11af340921ff94abd5acb1483280f111138099be3781d334c859da61ad5c7e0895508b2ebca2fb62f0197e SHA512 02a47d10417325778083e756c043892ae6bbfc705cd940454aa39f9c5430dda1575e8b45da1c865f336cff522cca21bb9b95622a3bbb396f35e19d1c176e7709
+DIST firefox-84.0-ga-IE.xpi 468080 BLAKE2B 7484030ceb091abc442ef77e228244ebce8f931295878c26338c25258f5e78bf11fb5a52e7482bfffd052b2aa6cf94fdfec30bf375bcc444ab7d4dcdd31cd0dd SHA512 39f1233377a7706807d54c23ca27852ffab56ab47395580b9dc8068b2a3371b43e842482e29833eb651197f048370247d593f3e601cce56aab5c9e1122255eaf
+DIST firefox-84.0-gd.xpi 493511 BLAKE2B 1440b22cb30cbe2f6431891c94fa88b0095bb84152d399aae7a1446e16c7fc9cf49527a6f03f99ec63f123e9807c2ba69dc6b767d157b18ee8dfc31956500318 SHA512 0ff382e3a522be671ac3b182307a42d090649c028438992c22d30e88725e0530f5a3cae225617797ab5c2f9abf298d239953a42f2978b4a405b833a99a495bbe
+DIST firefox-84.0-gl.xpi 525669 BLAKE2B 7a67462139634bf2b755660b0fa65f9a5cc77ef1042cfc478ff80e4dd214ad8170836e2c5570270c95560cee4c27fc8bfc9e4872cd7a7870f3dd17716274001b SHA512 30258168760ee43b11d6746015cfa466f460f2fac1d9f29b10727e2713fdb2d8e604e579d39fbb7a5bc4f414892ea34974b9d23c60ee6c9dc8acfc1cc67fabcc
+DIST firefox-84.0-gn.xpi 544459 BLAKE2B 9a106f01aa7e88220a46addffe5ed6d544f56c1af6ee5aa135db75c9ed9fd1e6c7468e31def7cdd5aa3faf30b757dd899220daa3db80b55d32c6ee7f374f5414 SHA512 1db4888d67623712d880272e44f8cb124168df375d94d57767f4608a92567098a4492847276e9936467095d59ad0020bafe8930e6fe5347963282fe5219125cd
+DIST firefox-84.0-gu-IN.xpi 542128 BLAKE2B dd6a6127f5033bc50ac99b664ef5d65201383228b3f21bb706b1f0d6cfab6a0bccfacdc535c06c6758e71c188e23ab026f43b1877cfad59ad2f928693c31ec2e SHA512 f647191f30a84bfa4e27becdd16b6ba5106efae162077c660c06e967161fd1ef9adfbb00d0dbdec58f3a6dc9b240bc3b69ddab493105521757e301aa062889b2
+DIST firefox-84.0-he.xpi 545452 BLAKE2B 492e6bbaed9ef08591fcfc9d0bbcdb191f8ca43bb78e7da34d4d666c559d864787a22635904659cffb15722b17eef8ce686532c099ed952155aadc25e79f46e7 SHA512 7742d3fddc10bf29a8cfbec47845ae2144940b78cc668e15ed14121f36c5900b4e1505f6c3aba4c6668ae46e14503feaa5edd6ba3d9380909f714130a7f46cff
+DIST firefox-84.0-hi-IN.xpi 568100 BLAKE2B a94274b16b01125cc04e5080def6c798307ae0f345a868f98c8083ce739f300bbf55736175b98aaef000d87ac8aa4615d28110d34e003c5735867631960b86f9 SHA512 8776607acb3d06f4ca5b351f25d7f29ed4b2deded1fff6b94f5ac9640634a31401a50466f677658d678161079e14a9747e35406fb81b503a3a8b214cdb245c85
+DIST firefox-84.0-hr.xpi 521268 BLAKE2B 64b34d05c2bb3d58ca3207d3444b26b4eeea2cb9e92eb4c580839b49c88107323e7b30a42c730615bbb2257db43d880b13401f0e5dc6e6d110e8ddde89b0953f SHA512 626543915ac5708ec9ab9da3b7f1ebae07e89ffb5fd5250451e778edd5d5cfbf0336a6a3f410f04317f2e92f2394282eea6645cc3d2ed124ff6149dfcaae5416
+DIST firefox-84.0-hsb.xpi 548611 BLAKE2B 748f6778fe77c3a2e458d1a3343bb744dbe4fbabc5bfefcbe1974a9659706278c8c5b7083557e7cb555723813b8ad8a452de0bc3a33212964eaedfce05cf71d2 SHA512 889669a590651c28d4b8ba09046860d71d786d8fbd72a31ff26a92d5aeb476d6210c4389fd1a70246bfd2e7b4e370e874c5f37ae531b1984d9c4b69f94a15162
+DIST firefox-84.0-hu.xpi 552385 BLAKE2B 5bdb5c30768728752c57880e486277bc28bd00a3483eb254eb782825f4c8197becadb045240cb9750e78eca5e042d32b8e971776123552a078a56dacd9f0d069 SHA512 9a05ab0fa6683fec9ebc9b346212956430ae13769cd63c696978fff027b07215a87fa9378f399e83ecf51c1f71f415939190e026eb21242e3fced1a3d33ba607
+DIST firefox-84.0-hy-AM.xpi 588502 BLAKE2B f5f8dcf9a84c8adc32c8208f5a7b225ac51cc8e2a930a625a474f060cf7ca8627cabb43f824944af3c4ff76ab2375516e74067a3d3bc919c8835fa6a928a2289 SHA512 37803fa34fc7eb9317302bd584062a018528dee0b58ac033495e49dece0e93be4f228b7a239ece41743fca33fd1e6f256354dfa4d76f7953b8a0b7625208163d
+DIST firefox-84.0-ia.xpi 519830 BLAKE2B 97f1f4d0488bc9eb64c08ca97b2057952e67a791d3bd2b293b61ba7c57979e4badf755976a94da066ff4cb17820f5c38d03ce440aa6feb9331f8cf38cf74b75a SHA512 9b2c31bfc1f9a6f378fabe39dc1120c12a26fc9d3d3eee11dc567d019442d3d4bca906f564b1e7e8d28399c49666ac80716d4e0d27a2606fcba75858ff6ed7f3
+DIST firefox-84.0-id.xpi 508528 BLAKE2B 0ba19da271d72d0c2b5768fd2720008d5be811290f7eae6a1cae5ae92636ac997345260ca0e0124b906d45e4449d1695f3d6c8e6f82d29480d6db829dc8e6bba SHA512 ebc7374c674a7b44731c8aacece81eea0f2318d39b58457704ec06f56e69bfb4dfc67796908319773ed0232afb186423e4bbb17f61dbc1a26358ce0391dbf331
+DIST firefox-84.0-is.xpi 478787 BLAKE2B e84e220cc64e4d3b089ba4ce6019f873de41fa84ced2738d3f99b67542b61a9af24b697185f3227f259abbbd7d565acb8c647ff00c79beac9ab5dd1ac9ad86b2 SHA512 38067ed0e3e04dafcfeeb05a224ccf581666725bac1e897bbf60c4637b43179ad6a9e3db70f18e32efbcb72986df3c65bd3b9f596227617e918704af2c96a8f4
+DIST firefox-84.0-it.xpi 448151 BLAKE2B 761bbd01089f02c3bc8840997b57db4906fc473e25bd8b3ace8f5822958a6d4330a4fe421d6b4dc5a1eddc8ba158fa85f4f3bc6d3bb3e63442ddeffafdde1066 SHA512 c23341882529638daaceb908bfcdf83e05293801603c5386a08fe397e49c0b8c4c5d58dd57b0d2141dfbde3906fb50646c2e38c6d42ae9935d1fa08083f87365
+DIST firefox-84.0-ja.xpi 578212 BLAKE2B e899e06f7a0699a8d1243806172a285fe9499133e92af3adea70d2edce298d3c0ec396825022df88fff33055d22e6572cea71f81664370d000dce55c56879050 SHA512 1bdcb173deebeb9cf26c526940c2550e4a26465fcee6c1086c4c05c5962a5898287300e45aedd355e150a73879f8ccc6e0aee32fc955e9d662504fa92cc4913f
+DIST firefox-84.0-ka.xpi 579054 BLAKE2B 4380bfa016e770ca96fd18653fc8e96dc6763ec85ccbcba064e632947774a854bd896ab63f07d393c81daadc70f494dca98088256613283b0e25527e33889357 SHA512 d1d7fd4ac9120b63e073b2ca5fcadd6cf9ffb9e5a6e29f30dedc960aef99cd162bfc1fd92c4b348cf4140b11ee013dd4491d2099565e82176252a0e00d45230d
+DIST firefox-84.0-kab.xpi 538410 BLAKE2B eef8b4a1bb30fb1a204d60791cf6922d17c3a954e131ff8a7f9240b2c0d070648a08353aa9a83066b48d90510b53a406837e3211822cbd17a25cc8f7c4e77447 SHA512 1d4770edbe5839ca6b2b8edb3e2d357d19025faf66989a3dfa07355d193d833d89ae2b19989688dfcbb47d1709849121249dd8498a8b5f25f57a63100715c15a
+DIST firefox-84.0-kk.xpi 591061 BLAKE2B deab9087e8354d79b0629d8f75915071cfd8a80d654723d77f24a5e9b123096e8dce49319654f3b669f9cf04dd377280e9ea4ed45cd8e83934daae8415b7e6de SHA512 c8f3ca399159ea43ca38468f2c2fe6ece2ed6d83b052d5759c1557b0c688c40b75b05bcd3bdf9fa963e52360d6d1bf6a8004531d03de15e62abf04cf774d5448
+DIST firefox-84.0-km.xpi 527419 BLAKE2B bb062f57a2c7aa21409fc99c05edc504b87ad5fe1133461848387866cb31fe3b2e9fcde6fdd3e1c2f12723dd593e0fbe0afdc4db256b479d1a72deba30c6875c SHA512 6b737d96c560b55d708ce92d234c0fc4a3e87d105ffe5ab8fc89057af51bde2eee2c95f04a1d0ce6e545e0b76a9d34f15724a42bfed9782d2bc1e6403d7e3c87
+DIST firefox-84.0-kn.xpi 506712 BLAKE2B 25282bcb3f26942789f7569d425f6f0179e724cdb22ff00f67c1f95aa7302237cf4d49adaec1a1e1dd9d6f8f0792683bdb1e7adbdef6a32f6b2519de40d075f3 SHA512 ed99c461288553274caa6de3cb865ac363cbf8a1a7ff795e23aa2edb77eaaed6386781d62417841093174ebc46351e5d7c026b419dfcc562afcad612f7fb4e20
+DIST firefox-84.0-ko.xpi 564748 BLAKE2B 56ab2ccec37b51353838baaf6b50912726501d571dce0df5a94c07b82db4c289bdcf67be082a3ae0853eb240383ea0bdcdd92c4540ee40d03bbfce49b72a2104 SHA512 d3f293c4e4c7d5f77ab87622ef7fc533c6b68579f98c09295efad0a60467fdc03aceb5b71bfdf145fe1ab7cd11629741b729e21fddd780c3e13b7c4dae0cda7f
+DIST firefox-84.0-lij.xpi 476806 BLAKE2B 10bad1cd516fc22fea2a495fcf910b6b2f20852a66442c769e06f4e4c0829f7400148b678a2f7359e7133937deae6f0568ffee0ded28b748fc04a1efb6de328d SHA512 dfda924231008a482d415eec90b18eb3d70e8f4b43a6d1826dbcd11ee4d39b4f677ac2fab9af071af3a5abc6acab69c0f3aa7d7b2dc041017841e3b49e0f2f7c
+DIST firefox-84.0-lt.xpi 547535 BLAKE2B e625e6988dddc081c6617aa6506c6b2ef768759df4bc4642b0cc93421569a0c93da7f76acc80cda5e4c1bf1debec2885f2e588b774f0ae0d60cb2a59986cb1e3 SHA512 9bc553ab3d09a963f0bf4d29517c711aac28c29426ef6e2d84ab4ac5980fc0fe4fc1206305edcafecc9fc4d0ecb56944325674291526e3cc6418f5ddcb7d364f
+DIST firefox-84.0-lv.xpi 470837 BLAKE2B 2dc830f7354b6094b2fb6dd302227df015992ee577107a566bc6f073829a1d07e4e6e6112c8ef8ee12226740e57635ea5a78eef2d825f490b86ab31acb38778b SHA512 db1009a2f7e0fc1b4de620c51374502601fdd9dc18ca1d1cd4f4d7e349a473543b8c901f42b10c14a0789d21200d415b153faf9de869d7a93e503e48183fecd2
+DIST firefox-84.0-mk.xpi 459824 BLAKE2B c92bc80f04841a4b831838fe7a4ad0e0c200c3a06b09d6239ccba87af5d3ad20220a3c31b267e1183d1c0b2f0461b620ad576c634c34bd2b2bc872b414767933 SHA512 c6504900a0179f7c65a24716fede62f027ac4c3332fa4e0329dfc6b333643e396fda636f9b3f852b69d016dcd9a34b632143393d4d6742e0220c5e9f789b9658
+DIST firefox-84.0-mr.xpi 541982 BLAKE2B d2e96dc56c627a4a355574e2604a68a85d8edf8ed9f060617af87405f519a6246ec1c967c1fe1315a06328f45134004769b4f3d5cea67c413a7309173a53c581 SHA512 cddc0de257a6812ff7920eb6ea297d8456696746492840ab47f9cc5243b5fe7fdd4c133f765873db73708e2b31d59d36e7c5b3243bd1959457e2a10ad9181826
+DIST firefox-84.0-ms.xpi 454814 BLAKE2B 70a6bcf169de0b5216a3a8114dcd3f98d60f77fe5ddcd24b344381ffda66c758c59dce4b0b0d8b5955bf6464ef5cf6ef15adb24a3c8e475c1a9b796b57200d75 SHA512 d87912ab922cee6591b93903b6ed109c7c19add0c761e68afeaa93472f07d1dc93db2edb9cefcd0471f42c230eae98e169a25cd9c41a357783b5f887a139e143
+DIST firefox-84.0-my.xpi 526527 BLAKE2B 7f3c3c94f566a57c3ec29b848021f4bbecbf803adab21497909cbb037674bd4ebecca9994ded00530d917b965c4d3a3559cbbf03f9160d10ac811f47e8f206e2 SHA512 0e9c858ab9e278421ec09c728329df7cf04060c35ff7c56c6d67de8d25e1b1f21044845e04d1c747410ec6d2132a017589a4571dd4ef9e5c7335abab33126951
+DIST firefox-84.0-nb-NO.xpi 516938 BLAKE2B 83dc51cb38a223606e8aa7f074284a14e2f1ad0b9aec47b6da08c0dd4f8d11ed184217502961b1437dceb890e69c9bf4a88fd76d64c6fd8371ab5f4b4bc1316d SHA512 2df0cabe58df1094fe4f8a02f2511e64db788f7f7ee19a0024428159aa770a105637a78c2a0dca7c2b40100aea8f804d78329f9a8a19c4652c4ed99a60279dd3
+DIST firefox-84.0-ne-NP.xpi 483416 BLAKE2B 1c81110518ee4bb5b7818cdf87e67209883c83283b66ab72397ac6c482128c96f3ec2bcba864aa89cbe8ff9b7e3a014c3100f32ffa17418acfdffb433010097b SHA512 1b27d3e7a0dc66988ccc4436acba437956c11197e910f02b9555d8ea8ff711bf0f44540f239075c972bcee3e73018fa14c1cff5769634b224565b4073d54d1cf
+DIST firefox-84.0-nl.xpi 524178 BLAKE2B 404aeffb8d82192d7e681c32bd0a085d5498f3987de77962309f9c7d7d66ee8dbe576028b86d1700014a7aca72e6430def844f00cf7a40ba99208dcbe4b02a0b SHA512 eaedb9e77012b7f1d8460977b63443b4cb553596524b33ef276c78e56a68b8cc527d724f21d7fa80e44cf68c37261e6fd8eb082179c064953cec92a9f80cde01
+DIST firefox-84.0-nn-NO.xpi 517874 BLAKE2B 09f2f0fb088512c847fabec49203b26d6e729a2d221ea72d44999a9db9863c51d634e47c59fa82d89c94df9017ebbecc8ecebe086263b9dd9f043af077a59dad SHA512 a2ac5595807fe3bad05322b8a677249cce47feebc8a56468069cc1e4ae4d4901904634723ca341c0211424e70911b233153c3782d6e5d34893f7ad0eec18cbfe
+DIST firefox-84.0-oc.xpi 540049 BLAKE2B cd370ca0a2ad015d1aef64762503da3d7399c977ca58034d60218b1b2a7724f60f357614c7e81f637e9586c56c171228a7422f03ee71abf27e5adad6c2398645 SHA512 d93c92335ac6b2242d620fccf97865ea4f658537ce459f366562ab2740852c87c57124c32522d1a3fa03f050d7a4b09bcbbbc2b83eaff65925dd78c9c8923679
+DIST firefox-84.0-pa-IN.xpi 584955 BLAKE2B 7e0ebcbdd4738da367e8b31b741fc3175e21a1b591d969554833556b3e7ec5282c0c4959db26bbbd5be23a4c6a302b2122b8876c9a080a91e867f7a7c62e0f9c SHA512 8e7108a94030c9651a2e523d2758cc76b4297f262cbc9d7ad44479bc583a038db3fdf868d45713b69a5b2be9a6a3e523cecc9aca808f7f03833bf9cf38dab846
+DIST firefox-84.0-pl.xpi 543364 BLAKE2B 1fef08c91adf72c8c7659e6b679820bea030b2758e3db5b89b8de9a23c628ff290d09059b3115ad29247c6d689c798825c31c4fae1d35eb0257313541c065143 SHA512 274cdeb1651dfcf4f9d4341e940d44808a39a1e9824f0159cb293c0df3d1aec7544494a528e1af1e58f36aa46c8380bd3e0505df33306897f3a42cc3a9978f45
+DIST firefox-84.0-pt-BR.xpi 525585 BLAKE2B 51742a667b6033ddce2c0a35b50c1f36b40fe485210776d21c5d3fefb566567ca54b0b02cdc7dfd31857718d142933d8b595dc860c02eb253ddf78b553de0b8b SHA512 16032ba444f3e4adf597ae73a23b65f2941efb9e29228fc511ef2dba5d5577347cdcc11bd57be1e899beb428ba46d3326ab8a4754fa2af4f06496ac9f11b4320
+DIST firefox-84.0-pt-PT.xpi 533312 BLAKE2B f3696839351cd10ba2a556b29530bc74c81e5e3c86fb2ced3e0232a44312ec96574614954de9671764958da117daeb1bf70ab307d3cb2801a903643526c23400 SHA512 125c834f801977468d0e8ed31a5c99ab65a6e92f191c31264758ccf407449d2a4694df7ca967a016d0adbc45f007674be3320e9124a7db135f7db0860f201829
+DIST firefox-84.0-rm.xpi 524836 BLAKE2B e60a67a9993bc54d93cafc1a8206c107d030199ba4150d78ff3d213058633c63741033c0aa8bc5218935f33d8d207f2cf6e3947b2a29125757178bbc187dc55b SHA512 417cb841707ff2200629a9e833c7966ff95541a3efbd3d148c90205db284e8f346e2e91ec752f6c32878c17a2487cedc4696e96ec6d75d3b7062ceb0d00a56c1
+DIST firefox-84.0-ro.xpi 532968 BLAKE2B 8ff1442c8cd5f4329d7313503b1d6da54a66f8e19996ed593a87bca2452ce589acb272c8c808e9745e1ad6b6d73a1b9366d7aece8b2e0ef92b29f833d6d7b5c3 SHA512 b4dae10fffcf6f2bb8f1de1db2748adf5a48f0898de9e3a6a1676905d53888905f81ce8280c5b279ac2ec13d830d86f65f724680b2492a179ca0c6fc7e9d84fb
+DIST firefox-84.0-ru.xpi 611899 BLAKE2B 8733ba5d9e3b5a7e0aacae69069c7e885583666715509fc272cefb677d50bc9ac2f7327b9d277818d281c36a80b196a303706b07deaa755e60765ae6cade4f26 SHA512 43550c1547aa96d164c1290ac9284d5f13c9b972f1084685b52dac273f962a8339218c5d41d4ca3e690d6194dd6e42c14d8eb5c8aed7867b4a469082d1447a19
+DIST firefox-84.0-si.xpi 492923 BLAKE2B 6c946c3dadf47ef8e9051a6e37a1b338adb9c2c20ca2294b48bbd7d7ad1fd7b337a78ae03b07261b6ebf76d13977102a418dd6bb9ef16f7484c24e5b3733ce1a SHA512 4e5adc12e09d09c8b13b6d15ae3e2faabc08e1d7547625ce95b6679e0d7e07e0309bd94abfaa454ff6f4179280cbb505fc3abd6b9051b58ef0d1aad64f776fa0
+DIST firefox-84.0-sk.xpi 538489 BLAKE2B e88c35fae89b9135c85b04018f5207dc3dc44aabeac1d68e87c4931cc05732f540ebcefc943a1c5cbafe06a510439afbd33c50cadea0ec6ad6f6e81c501e76a7 SHA512 5e802fffebea95f4bff9b11fd64adf2256a9712d8add1314ad6bbdef1d32e1f3ef28a99847cf17fd795d111209b5ded7c44589e87df7f4639e4106d3ec973ef0
+DIST firefox-84.0-sl.xpi 521132 BLAKE2B e71e87bca7b6dbbb38729e549a27ed22ebfa9b93c268d502fa1dced2cba38f9480b6dc4b869bdc8f52fa62452760edb00b874cb7e0d0963213eae9c5e88bc081 SHA512 e17ed51af13db97db9ad64f86bf126d9043d98023c06b5e1f56348f26def30af726d89fb7580f6673e6892bac97c1c3fd16e2ac09814a3f35ba0e8d398c845f6
+DIST firefox-84.0-son.xpi 425697 BLAKE2B 948e9e266813507894529eb3648436d6b930c8eae19a991789a4eb8a5870754ae60e94f07337a14d5069693512c72119d5a91a73b53e518213fa15c1a5a32a3e SHA512 64b222f00a497538f6b19e6e26c5d4cb98e23bfe5884539e927dbd72a505d3fabfc96ab26bcbed52f24891786208af7a303d2efa006f1819c4f715b6dbd6ed80
+DIST firefox-84.0-sq.xpi 542776 BLAKE2B f776b2242db19a71a71f67cdfc31cdcddf20c1a98c7803834538383159c3c064c1859913a2e0654299e327b897596d3e80c87684562b9bf8fa83ec4d72ca5520 SHA512 0a0e26cf5650257172d6984ae84e5e22ed6d78b8039d31eebe0ffcf6c2b4fe7af7ba410f9ab0604c0ed27587c11564d40281c9fdd3ffb4e3f305b9e350943d59
+DIST firefox-84.0-sr.xpi 563746 BLAKE2B 5a75b1fb67ca35eb8a287a704906c15ae20e279a51058a4ceea83b6aade588def50184160e4e8a82dc09d2fba1395d39191c86fd0d7cfc0f16d30bf4501c5725 SHA512 91a11d128e63b08465f9ebb7b42df96eb01c6dd1a5b0323df414c88d48b6da0869d4c48324fd1348d5c16ea1b63e323d696bb4d8551641dbfb2c3e632c12f4a8
+DIST firefox-84.0-sv-SE.xpi 527551 BLAKE2B 42e258161dd1970c231c6280ec42739dc000ea19b2ac9e1e174e722a5d719c9e6e249a4fd8a805bde5deca1d403856f28a1fa34d8b95ccd37751cdd9a08600a5 SHA512 da4a58d6e169a6840ca5fd7aff34b20573a3e80e90cdec6f3c9b7e5c8dfb9a7d97acea76a49ee6c4084fa719deda71ce670da7dc221ad3bd66e3acbccb3740fe
+DIST firefox-84.0-ta.xpi 521655 BLAKE2B c7e9cee0d581205ac00dedcec4494ca1914ae8e8f915b9464c6dadd45d2c2781ccd1fabdd16c3459f7d616d267fb36797db4a34571d18b74ce5eb75e8ba4e63a SHA512 86cb7f221eeaa52c97d54dae556a8718a6560ee40be2341c5d39fb424268df72867be48649a489009c0bfdd5b4b2f5a6d093bc8ae68be29ae7e722d785b683fb
+DIST firefox-84.0-te.xpi 558108 BLAKE2B 324801fd9496992e4e58ad1b3b7bf4df14c13e276dc76fe6b25d91fef6dbf1cf0338530031f4acacd5b747541a78ce9636afc1a6f59ea87aa916a9a262f8e71d SHA512 835901a98b950c1ba9db3abfae5b0ceac6b883673152274e52e35f1ba171b1b830b5febdea27914966c4b0633a216013581335a7e20db894889de78e9e4cade0
+DIST firefox-84.0-th.xpi 592812 BLAKE2B 39b41a4be7e57a70231add8156d8b8a781449443967f5f59821e9cf481e9b6ae2601021b77ff550ceeced447ecdcaee8f3ada0094e36e12106ba771385767d71 SHA512 578340f0e4228590851d1d77dbb3b14190cacdf45892ec89e1451875f087fe1c0663990bcd17554913303a7bce8bbdb2f32ab1706e475c8559da6ac9b5419a8e
+DIST firefox-84.0-tl.xpi 519348 BLAKE2B 38438bde658219211c9961ab2d93164160b222013e1cf52cfdd49a2253a8c0fa86f639a089fd20519a32b487f2b33d003a9835b93c67fe0bc81cb21a18a7197f SHA512 dc452dab869948160ceb9215c07cbe85bddba11c0569b76cd0450653ce10bcb8b9a67637c375f17456dc5f3b0c2b616ad34736d6f013cc6823094c0eab1e9fd4
+DIST firefox-84.0-tr.xpi 537926 BLAKE2B 071e5639393cf555e50c0e736c056898337a6a5e9865c8012fc6785e56df5d2f13f9701190a4a7fd5a9bb5317a42d69f337772c9695adafbdb305a54bf9d2422 SHA512 a27f55484a16abb6f6a34fac8cad4f1eb3022803de29e450e126d8bd3f77439ade3efc2a01e88e71cbf256733c6dbb1b8468c0184a3aad37512ed1fa17c864a2
+DIST firefox-84.0-trs.xpi 500696 BLAKE2B 84c38eab50465ca5d28208da45082e3fad5a89bcb0d03957f88cbe8663b855d419d00e9f895421df85143ccf3cdd562047af47bd2a03fd4ff78d6604a7a9d3b5 SHA512 4c00f609582d6f72178116c2f2b777387efc381959630c1ff797cd5d2e82c5e514c649bce76bc2cd45f44010db26b8e808c1b91b8539dc4e187466789e388f10
+DIST firefox-84.0-uk.xpi 606063 BLAKE2B 87d8f8d0329796484d3192aac2321a851c5f43a4a021cdfaad33d2753a8cba0c4b2516e4939876a44bd9e1ad0fa34426b067649d94a25ee935455be85433a587 SHA512 76f7422733523e9543300f9ecf4f9c71cb85d30ea036664add9256431be29c33e2f4d38ecb51c3ba39bb3326a5e2d70c916f13784f5357f735ed37257b27950f
+DIST firefox-84.0-ur.xpi 558461 BLAKE2B 892df8ec9b550e10e92f043ed5f88d9047190bcd9cd476117215fcb6519cc251b7606b637d3748bea4f32c4a9dddc37abd283d629e23b0ffaa07676d730b361c SHA512 a90d63beb94993dff11601ed59bfcae6d0ed6a549fb57ddb29f4abe55c33f0bde577553027b5900e64310111388c4d81b4db97f803263f886c90cce45d47ea61
+DIST firefox-84.0-uz.xpi 478518 BLAKE2B 0d61aae634957f392cb4d86ab510fa61f8357c61b7e05c5610b87ef7288da5bda6e2f4bd2cfe86b0c69fd8c6c369d12373207fe26ca98ec772db9a14a641c4a8 SHA512 a3b7a55603171c4c2892fbf5b88c3af9d4f54b52036b71211399fe96a1700a5577a87f2fd1418c3e07d59263d745ba609f7199f66236fa464237eb73a8b91dc1
+DIST firefox-84.0-vi.xpi 561443 BLAKE2B 675dbd685bc0215333e0d282d48cc2fe51f596134009ac93f9d5f6d8c572098996442de8b89ca26fa4a837e0ed4196e2317d7a5f459bceb2af17a46feb62152a SHA512 10f814e3287a5a6b050612b0a21914c306f3de258471ed0e68b37d6b8c669f263487e3c88243d809456fe91a7ade848ac45f65765af4f4f90fa116f3a7f76334
+DIST firefox-84.0-xh.xpi 427842 BLAKE2B 4c3cf47012d70110d912f7209d3ff44b3ceab98402b2fbb333e4527752966bfc309e74ae2ad0cb5853d7ec5c24abcb1af5dded72c23847c498fc9b6f0a168cab SHA512 333de2aa39179ed805a2848bd432720e1a2795d6ddcef1a2a241b1906c6fc3de608a27b0397e5d7a247411d8efb7fb771559d3429d575ad78d45c0af09737fb8
+DIST firefox-84.0-zh-CN.xpi 562147 BLAKE2B 67aab75c9f5fb8f21aa90996ca54e865f43d99e1e52a98ed44a23588395dc967589f5793a44a35cdce8c2ae929bffaefeca7698871d08266541b934f71ddabe7 SHA512 36e675f8b3f70f22e4cb51f7119cdece72ac799abb4c0d5e7be313469f75a0300b9b446cb9b66f18e27f3f6eabea6aaa51f65af5bf6a292384fd4f2d30046ba0
+DIST firefox-84.0-zh-TW.xpi 562093 BLAKE2B 6f6f76fb54c351ac68f1e898b96623223e5dd16dc9585f317096971fc5168b981f9d1e29ace9aa177354766e8099a586547a9e3f512ee29abdb5ad84f2f1d14b SHA512 2c8feee6c2db327f2de3d6489577f9e187122d6d596cf38d7575064425b0f0865920cccad46a89756e6550e921046069197169badce768b5af605a92f12298b5
 DIST firefox-bin_i686-78.5.0.tar.bz2 73048264 BLAKE2B 8502fd93ca2fe5b17983f42b09309260d03a315e05bc3e1348d7451a850a87bb88cdc5ba541ce7888a84c170b168a3df35e9289918956a990664e99b53a34b25 SHA512 dd460712a2b4129688423540b9d71a92a67ded649af1d8679c5a72e3e5049628e86a5537d583983c6e3f04a80fc5b6dd73dbb4f3d661b1ed7ae05a2a6bc656a1
+DIST firefox-bin_i686-78.6.0.tar.bz2 73136508 BLAKE2B eaa3a424b3f2e65aa85384ff2575df3f3191d81ec2ca93828246fee7b88c894665ed78c1a1debb204ae09284d6285db78b8c04eb5664d07e4f477d67a7ab0a5e SHA512 53cbc4bcc0e154fe3e6dfac150ca6158ead6e0205d92eaa5d888bdaa344edce59401dc05fa544a962e4ea9cf436a40d38825306955b5ab75765a69f51c914072
 DIST firefox-bin_i686-83.0.tar.bz2 74725746 BLAKE2B 31cd2e5c31f989234a7129441df0c36c6027ea9e8ee81adb0c9c855426c1ed7bbaf38549f50ce8d1efd56c38dead51e413b94d84aeb5a00f98331fdf6470e4df SHA512 613a98bb338c99af9e91d1ad59012164815852f569aa78e602c371d358cc8a7d03d0e6a4a57ab6392e7430b6c4f4bcbe6f9c572e12e978f7e76df74992fe816b
+DIST firefox-bin_i686-84.0.tar.bz2 79117081 BLAKE2B 8ca98ebe2fc1ae70ffbe92ed6d8584459ce0048074c96368dfc0c7ae046fab4e5bfada5bc55701c31326731dd9cba2df30a8686601d04c7b5f7330b9d19af934 SHA512 ee6ebc5403ae5fdadb15bb8e90e8a5ef1eb6205ddb4151c60a05810a61203182d42aa574fbc190db6bff02c7dc5a1ec547c8cc0551c2c46f748d8860bdeedac9
 DIST firefox-bin_x86_64-78.5.0.tar.bz2 71001691 BLAKE2B 88d3d697d546b371f31b435b5c48e38c7ed87561a53151f21d607795c7add345c604aeb23320e34cff1e2c5bda231ecda9835741ae33b9c8af001c3a2a91fc75 SHA512 e41a735d63522d633d194b11b03aeac26277877a2d1bf737f3b3f6a10c177d5c9b3fe949f92c1d94d5b38ddf02867dbe5f9fae0a685aa7fbcb91893040311e3e
+DIST firefox-bin_x86_64-78.6.0.tar.bz2 70888611 BLAKE2B e70ab489804d93bede7cfae3d3b341e155c75ac7abd85de909c64af702e196ac877465febbe26159a80186fb66f1200513861f2993f84801df7fec4d7ffeb115 SHA512 32abe83e27be517a37476378e5d5059b51e48a2e031fd104a7d9e17d2efc6075a405fd2ed5c36bc446974ee44113ddd6a54a84bf2c2bdfa03a8ee76ab6ac0fa7
 DIST firefox-bin_x86_64-83.0.tar.bz2 72307348 BLAKE2B 1923d6bf043d6747362a5483f2bcc45ccd13e13a95c2134ee975bc42a6a4af33244a98f3b774edec7b087873ccce702a59978a624c293f87c0093b639b089c39 SHA512 7574aa85e3cfc1b4de94d11b360f1a90d530a1e379f569bef0a380e6dbc5e0968437e966745db0bea6a8d4ebc4d3776ebd6418281b601f4a45c93d91189b3787
+DIST firefox-bin_x86_64-84.0.tar.bz2 76402088 BLAKE2B 86d8201ca183f5f2055957222cbb9bff44bc813bc55f150d9b2640778109f3e9cad312b559e5a998fc18c50288df0a62a3377fc720dec42fc7e4987abf6bc807 SHA512 f1a7eb9b91a8975817643f9fb720cd14f212b0ba64e2e0a87c58d52affaa31031c0d3bb3425d2a900d97b5fd7985da8fa5361b97179a829a1ba39768e77f21ca
diff --git a/www-client/firefox-bin/firefox-bin-78.6.0.ebuild b/www-client/firefox-bin/firefox-bin-78.6.0.ebuild
new file mode 100644
index 000000000000..fb223b7f7b08
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-78.6.0.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox-bin/firefox-bin-84.0.ebuild b/www-client/firefox-bin/firefox-bin-84.0.ebuild
new file mode 100644
index 000000000000..e3f94c3c5f32
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-84.0.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+	alsa? (
+		!pulseaudio? (
+			dev-util/patchelf
+		)
+	)"
+
+CDEPEND="alsa? (
+		!pulseaudio? (
+			media-sound/apulse
+		)
+	)"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+	dev-libs/atk
+	dev-libs/dbus-glib
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	sys-apps/dbus
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.11:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	ffmpeg? ( media-video/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	mkdir "${S}" || die
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			MY_SRC_FILE=${_src_file}
+		fi
+	done
+}
+
+src_install() {
+	# Set MOZILLA_FIVE_HOME
+	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	dodir /opt
+	pushd "${ED}"/opt &>/dev/null || die
+	unpack "${MY_SRC_FILE}"
+	popd &>/dev/null || die
+
+	pax-mark m \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+	# Patch alsa support
+	local apulselib=
+	if use alsa && ! use pulseaudio ; then
+		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install icons
+	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/browser/chrome/icons/default"
+	local icon_symbolic_file="${FILESDIR}/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^} (bin)"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+	local HAS_AUDIO=0
+	if use alsa || use pulseaudio; then
+		HAS_AUDIO=1
+	fi
+
+	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 9ab6b597fcc4..c0edc8152064 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -94,6 +94,102 @@ DIST firefox-78.5.0esr-xh.xpi 427806 BLAKE2B 676da7d81426b40c2649b225733df74ff8d
 DIST firefox-78.5.0esr-zh-CN.xpi 564767 BLAKE2B b5c3e773c3bc58ba80180bd018467df1552b8cf355ca33d96fd4153e169acbdb64dd22f3b4b7449046a02835f406046d2847b161f6220edca6c087cc9e5a8c25 SHA512 489052281501ba642270d65ece7b6c4e5bf2e7ca5101b9dca4c657000e8affd06d838b7ca06d6d399b35d401d288b44d18da2661d3a2c96a04214fd8bf4a4bde
 DIST firefox-78.5.0esr-zh-TW.xpi 564724 BLAKE2B d55faedb630ecc2629d1e2b1adcfd4cde51d119fd4599d25ef0800e5875efea65db5102fec36366b6531791f16d0f94e8e0dee0bdc18868ad9bf5208471d65c3 SHA512 95e4fa378cf07927b13a9b0e9d37d6320c4cba26f26df6dfab65fcfe1ddd21d38cb5a387663c8c96b6b3e2015999af4d355c0b672848f874101c998abd117047
 DIST firefox-78.5.0esr.source.tar.xz 333995288 BLAKE2B 35140afb6b4d15052858e7864753ca74099edb24ed5e459f1f48114f0946f5e007486b5561ba9a545566033d71a69f0e6163dd17204cab717c441323972f089e SHA512 0d16013342b6e8d67adb5c111177ea4796db4fb593da8aa254d0d95bdf33fad798c2dbb235d44db4177c32dd2d7b3ac26b938b476342753ee8d6c83d968d0281
+DIST firefox-78.6.0esr-ach.xpi 460291 BLAKE2B ce5b89a49f04126db1893c488a0d5c2d7b32ced7110526a62ba7254d872339b01de8d8fc4bbc842d2e4f5d074cd5d2975cae1239c31abcfb986e30ab35e121f5 SHA512 9fe7142739c19f7ff65963a70f22fb31d4da676b72ed1974571611d24c033ef1ba43dc0680ddbe4ff9c08860bd65be59842483018eae1fc9d7a03d949ee56af2
+DIST firefox-78.6.0esr-af.xpi 428364 BLAKE2B da06e67acd64ab7a8405325d7af12a3d546f8e0eba7ab5608857faebd900d7530efa024b137350ea447d986cf7f57cfacce0a07e2e577dd0b2c18af456234064 SHA512 d18f2c6915f5c21b59deee498b38bedaecfc31aec66048817ce853193f16064b86fbc6006351dd28c500a34446c67de6aeba8a32f612de8187667ec2bcc1f2ff
+DIST firefox-78.6.0esr-an.xpi 508367 BLAKE2B 8ce5975d635260d0f7412c373b6cf24293bc88063d52a4022a0ce0b45ce0be5f80af43d203afbac148f5b24b8058b9b223a9f74ecf63f2931667093c7a0dc79e SHA512 293bcdc394a3ef88fbc696795934ff8b9e0a735c698c6536e27dd7051176f86e3a0686902c929672ef9ccbca9e7f48a0fc731e0745f7055b70e9c3913af15191
+DIST firefox-78.6.0esr-ar.xpi 560954 BLAKE2B 625419e32abecff7c394db3ad17cfb04fa5885beb3748b7e34501bf10598ec1770c3919a2f9747ab1b72bd765d1e6ab484ea7b965d0f7cb4ce6951b02292ac3e SHA512 60663351dcf501bd0153c5e739d903b59cd4ca2a84413f6eb109b7ed814ef9c5b156c46f53b1f540d830ef45cdff1de3d6a651b868f7d975f4d8d062904b7c18
+DIST firefox-78.6.0esr-ast.xpi 456387 BLAKE2B 89ebe475ffc4187cabfdce581d9d425903da40eb5851ccd736623ae4d892e13b7aead5b159393e47a5d26027fc241fae3abb1229eccf0013c0852667fc559ac0 SHA512 5cd6666a682a887d63bfb50256a065a678058eeda569b3642ecf44009971ce6a6b6c1c9a8febe4508f988c3e83bbd83defe579295ae099b9d23aad041ce0953f
+DIST firefox-78.6.0esr-az.xpi 497439 BLAKE2B 0011bd73b1be903d23ec7761fb28db08275dbb3f30e20d746fdb5cb3fe0ff565a66aae4d8496e32df93f89aef1e9cbd824e99524deaefab25ca36c4e6ea9bb6b SHA512 2005f5c5d6095a3d5444db2a4ecfc09d471bc9b9dedf92f5dc8099cd7ad48a5e3aa6489679ff1ac726f974b9790618733ce8e27122fe776ccfdc982425354a4d
+DIST firefox-78.6.0esr-be.xpi 608650 BLAKE2B b7e263175025c656ccd9cf78e9c599621fe2a3099e9cbf0c6717446e8eda93a8b747e7f024372b07b3f1801936221b12a3a2275c8c601de6486192a12f393982 SHA512 1dd3c679e61629aa0bb5954354875c43f297dba8be3316f481a55903908765a16a239399fd4b7147569b08f8dacbc8549229739e2e18125fc190e602380e6e43
+DIST firefox-78.6.0esr-bg.xpi 553959 BLAKE2B e17c935553a85c2dfccc90de399a29ae1fa3c515e3f2a113bcfc6f1bd0485d1e646617083764d5043395368000fb3dcf26472855160ed1cecf2f1459016e83d9 SHA512 0fbad857366bb0749c34b51d9a21852c371e31918f7fe93faaf3d7cedd382753d059af9a3d2f378933ce883eac3d44c6253fc4fed57165260b8964e4a238dbc2
+DIST firefox-78.6.0esr-bn.xpi 572603 BLAKE2B ccf925d9d930044f1b185e239aed584ccf92e9c82190ab32119d292efc85ca3d4763a083110e424d0ff43e422ce7b970ff8018e785a3ef685286d3513138a544 SHA512 1dc1855ba16215b7d24d4044f6a9a4bc8ee18d9cb3ebaccdd6f94a5123c847cbc79d340bbee973158e0c88a03d4f135f30dcc0f5eda43e8923503b75f5c96a9e
+DIST firefox-78.6.0esr-br.xpi 507127 BLAKE2B a73881f1534850bbf8569127a94ef42617b4fb9a6f8960baa134db3a277ab5e15691992599b972aea7196d52f96e774b999da1f622a435e15f1a0ea3ec702c8e SHA512 5790bb75b86da42bf7760f88617abc91ed5aef99b9681e369b29d786d9291fd08bdda72f29c4b6596cfedb8f53f03f97caf1a547382f13666f2449bf592536a9
+DIST firefox-78.6.0esr-bs.xpi 463798 BLAKE2B be85edd662a1e79d35ed170f3470f61f665da491a426d81dc4cb29f1ee47a418ad4c7a20143339b8881cda4f8e866c797d19e16dac51ab8c00ee1dfd5a4b5e3d SHA512 6c4300276a0eeee8cfc5e6c63048c3205e411bedb7bf1b4ba885bf56bbadde4c413aec5d93a7affe65045c23606309f099677e6e2e5a8ef67489015f617cdb59
+DIST firefox-78.6.0esr-ca-valencia.xpi 517172 BLAKE2B 4a666894b4eb7e427f9b50ab5a1fbf3958ef75a5411f54f6621cf55d7f9e33a1be951cb7cd749e50b03bb5ef29a3c873ba0e63900c1e81e4b5bc70c8daa66b23 SHA512 1ded40253bcb409a40169099b8197c9f3d633d99a9c458e6cb9fdda25722a061764901fdb196d3585a81f4177e12b1e943ba980d9472ca898b0918a3a7a7de7d
+DIST firefox-78.6.0esr-ca.xpi 514163 BLAKE2B b40cbb7056d6583ef12255addcc7764b515189086156f28a7095a575ee651e5ae41fcd133962d888d707a1586cd5b3f3eba6cce2adf020db08a57fc5012f743a SHA512 f3f58b859eb77615e61646fcdcd0de3497b9ac1e542dc19c9e9d6eb9cfe0668d68cc4a21412a9f0619c55689084525270256d4e4fa1ac62c379447c53ec55065
+DIST firefox-78.6.0esr-cak.xpi 551544 BLAKE2B 1f1ac280819812faefc59c22a62494acbd01d85c2f438ba108f77b33fdde12251286f6bf6c92a58de301a6c24c50f49530520df2fb6b459934fd65afbb27eb52 SHA512 292f68262d4414f71ec23b80cba96c5eef0a079c840f8b23d1c69edb6775817c39bb7541c67b9e18986e4e562bd0ecdcd4605b9ccc98f31000f4fdf0640260dc
+DIST firefox-78.6.0esr-cs.xpi 540331 BLAKE2B d418167eaec2e0da368ea09c41bd3b7ca12fe90ed826ffbf824dddf6eb421f26bb06acbd33209db5d85ca543c7133590cca9d26c306af372116da2b9d23491f6 SHA512 f7116e25eadd13e6eae2702643d70b15701a6212b6ecb570ba919182b56a2ec36db7896f6390ed7594beeab22e7ff581705100896a837829c7a90c9c30a02263
+DIST firefox-78.6.0esr-cy.xpi 530696 BLAKE2B 082cd0ff23a006655d79f46612a5a7434ca1e716b72b0ec8b72fff23c0edecb0fdf2b01a2e8e5b535bfe4e51f0d56adf699f97a1e39e65dd55d26511e6b1f22d SHA512 6f6f7d34fbd88f83a36ac92f1e86a4a4050a79bc5a2706a5875ea7167abf3a2e57659a5c502f9fa7dd47cf88dcd1827b6f8db314528b6ce2e6ed81672835c1bf
+DIST firefox-78.6.0esr-da.xpi 520281 BLAKE2B 70ca75b633922b377258ebc2f2946293276846294963755f59aed2bcb15fd80ac55a55aeb763281ac365ed9ee3f52bf1d5c9c16a06f7ce6b9203bb5c76081f16 SHA512 63738a26a7056facf12e558aded45ced60799184a2085a670491017266dbe80ea31266ad303688ac9a5f1dc8b75ac83487b703f0d8243681024715cfb81770e8
+DIST firefox-78.6.0esr-de.xpi 542848 BLAKE2B 54545fdcad3d6fd1fd3f85ca29ae66bae7027d7854103ade42858d42dd3ca8b62468ad435772e8b7569bdef4574703ff9d26e1bbbceee72de1c421ab3b9be01d SHA512 a1d92d4c068575365242ab89d737a4672a1fe0cc9b743d70b6e97a230df39d39e9b74e5cc7126e252af7c7734e15740c5471ca805dd4cfbdfed0aa9460cfcb4d
+DIST firefox-78.6.0esr-dsb.xpi 554270 BLAKE2B f855baa0f29315d9bbb31c2a868ff792c688af83520df4eece94087b5022b3e30fa740bde79d622d22d7ea4bd6fa9264df0734c01722a805bc591cfdd375b136 SHA512 399cf0ae2e015e8301a869c3046c3d7e1e0fb526ba10655f2e3264722206897ef2f0c1d65907686bf14d148b52626b273dce0d840be345fefa8acc3eea04e9e4
+DIST firefox-78.6.0esr-el.xpi 626564 BLAKE2B 76a573fd004c872a549fa39db092b9ecc8316febc2ab31389e75edd605a14219f9c7837e986f97852c90dc016f078908dd772b38574a6d00805b4f8079d55f81 SHA512 28815e975294bd6ed7810ea904a8f79d938d7e4f07983367a836d5783206b3aa746347a51009a6bf0c3196b25ec9e713cb8c1d8891db0b4a5c08f90ee12593e3
+DIST firefox-78.6.0esr-en-CA.xpi 497727 BLAKE2B 863bb393fcda0ec1f99ff40a428b22173cfdf308617ab36e6b7b82d536bc26a15fcd7d23a24b3bb698c17c4748be920175f255afd152a2bc7ce9b18c50aeb6a0 SHA512 b1c02403845ce84536b3c3cdef3284fa609f9097311fd1a589b1b7b1d04f2bda5c666dc86aab1638d3b15ca3d26de6f2f27609300e3de400dee3f53683ff01f4
+DIST firefox-78.6.0esr-en-GB.xpi 497586 BLAKE2B 395482db0b64e2a2ab9db2b91287e431f74a71f264bdcff933b8b7ffb4bf5b1cad79d4c046cc82f4cd97dbf8b7b4332b243da77e7af418ce3ace115025c0aa69 SHA512 b38ed7de18a5748917ece600e8ad9a08df45da7a6155a0a874cd386540a679551d72acf15b91222297de36b63dd5ad9256fce98aa96ee4b15e7c396444816c39
+DIST firefox-78.6.0esr-eo.xpi 525730 BLAKE2B 2558a9c8000d92ab3d28fce8218c9be4e9057826ba85cba7a7f01c8dd4f83cd72c281e27ff0c51de6729e073579367e82566e51a169b8052908dd21090f11258 SHA512 40321da3b7b413b5acefe844cda4bdf6273e7106fb49f68c2b2beff7a351346cffb56202dc9e5a1f6c37886b888d2c918ddeb542aa887265da8c1cad2306c982
+DIST firefox-78.6.0esr-es-AR.xpi 535794 BLAKE2B 5791574b22602a133746147c8ca986818f35ec9e2a71e7869fe1665627418fe45d07b4117bc8267bb972b53e041c775da02d179800600090015ef288a216b2cc SHA512 d1d667b982efccf56ab0dcfdfa314f59db13f6057bc251459844a2a6a2eaf7edc68d991aede613a950351752f7eb0fb7ec9f90b79e122265ce7ebce9c83bb1e8
+DIST firefox-78.6.0esr-es-CL.xpi 535350 BLAKE2B 27a24e34ff1ec13df225bff43969692c399c3d2d220f52c278d0b04564d8660354e206686534f124d1fcb9087f34645f339228ff70064977c860d44775e21f1e SHA512 7dcb4c142b31fce28b9aab201ef4ce495fac9af162cd6469b582a9c17060edbd8f6d04346a28393d186cdfcdaa965dabd6af25b0b0eb4ec0ee7e21864ea9cbed
+DIST firefox-78.6.0esr-es-ES.xpi 522711 BLAKE2B 94f4fe0bc5c275c0cc8e0541fbaf03878d12444895d14cf91957178d63bcfa84f7ce17d6ba095d2911a2e08b2e20937f753e515ff94b740ea32fd02ef9c06816 SHA512 04ecf3bf4d7514bb7912dae9b257f92e8fa1d61a1bfc8689d245a58121b0d4bc862e6a8acd4f3a22c73e68727120e700467b7e08b53f900a166dbb89ad14e9ed
+DIST firefox-78.6.0esr-es-MX.xpi 532300 BLAKE2B 8f5286895393ad68a0dd7fb930e670ecc156badf1f4af626685db4bda84f8df5b2b2d40bafb9892672d9b2a94e7aadf7089bde0da2fac031d7d84b46315e0aa0 SHA512 191c839c6d7a76eb6068d6f6838287585f49ea80f740ca4a294aa9badd218ad938dd478f64bfaa5dde818aac6121e03f2ea2cf6a4ab866dd9ef45a3d2bcced4b
+DIST firefox-78.6.0esr-et.xpi 485236 BLAKE2B ab6d46c9c8a0799f810dfb8b63c537a998cd52fb4c9a72449234ea95788fc2c55b1da7797b49c3d4d10ef8195904660339a4f31174ab45e342837b2cdf2b21ae SHA512 74db8193658bbbfc69ead89af2db2d295f923167ef402af83d5ffb436bddea422fbb5f3fd054bdb9ce2f4570f9c11b67d9793b973576a5d150044132144a81ec
+DIST firefox-78.6.0esr-eu.xpi 505881 BLAKE2B 0d7d9a979120851d2a1a392887984bad0cc3f82d7fb1b5f960c5347cfc1894659195d325f82f6bc0eed47a4e3719b7fc160780b5c9391c051d6b62bf289f2616 SHA512 0df7437bfc8927c2287fd3d359555a64f2dd0eaff2d69d85d33f5c52f6756a111d77f1014bb08c0695f3d648866d83fbe9a8d95115d74e7fe7a7c4e73ef62ad0
+DIST firefox-78.6.0esr-fa.xpi 538914 BLAKE2B 2b31854e0b48d87c27455917d50314d5ae94f31d4a87760978956149f23701815596358f5d7209649bfc2227b3f3eb6a7fda62178e40bf89e00daeac22428248 SHA512 c401f5bf69419836d097b9f192fc8f45fe83dc76ac5778782d3fbac5d0bec260b79a53ae6a626bf07dd4a89eecc49d80047d989e674342ea63216c5dcb341b84
+DIST firefox-78.6.0esr-ff.xpi 481611 BLAKE2B 0fbd2e4b9769bd531cdd6240ed2afec4bb58e953393e68005ea4809d3e988dc0d20b42a78d1199fb9fcff0407897808ef17fed111de4745667e233e596232bcb SHA512 d280d7caac62c74b5f70e39b76b6e4b8f2aa6aac41ec1a2a09070ce98287fd40ccf9af45c94c239349fc54d1341d78ae6b36177eb25620f62e4051ef110c9578
+DIST firefox-78.6.0esr-fi.xpi 517921 BLAKE2B 8ab16cf64814e5a78cbf1ea987a674857709b63ba7ee8e31f2fc23910cce17b9b76baa920ac3b3172df7c53675b0a8552ca3ddbf8c1b6b5dfb66eca5a4253861 SHA512 77184bba0efcc224f798b87a7296f87524232ae06710bdb983bfd4de90e97de5aaf66cb5d2fa804b577dd2dd39e496a5429c537251bc544e0cb7902aa6102cdb
+DIST firefox-78.6.0esr-fr.xpi 545887 BLAKE2B b020b71f046ceb1029621502276890ea73b1653ea66c2123c825e84cccd1b43527d98be31ae2ce1c59efc94ecfc95dc52cda30de0c919e1753e8eed3d8e8b515 SHA512 71c18e76dd13e21579385bd68df4426e33473549f5735a76abebbb1f34e5d8ffe082b85de6cd8fa635061bcb6721fd1c86c99524590a5b284b430ff7ee6c39ef
+DIST firefox-78.6.0esr-fy-NL.xpi 532467 BLAKE2B 9e64a9b9716e587629600c55eee11c6d385c75f6255539388106b4eb1171280f8dfd13dec31ba0269deae801a700080ffbf617d4dbec029793759f5931dad6e9 SHA512 932e680407012387364d54442f46fe79dc0ded489dbd8204bc54ac6fe31ba80093cafdfe02351939edd533071a0ba50f7c36ab28162a8b1502378d32276b2f4a
+DIST firefox-78.6.0esr-ga-IE.xpi 466891 BLAKE2B 48dda66a08aaabae1752679ec76f80bfb29facd827cf37550ef57d1325bb1abc98b501853c15c32d5ea6a483ab87f3c44b686e416d39b6545602dc448d94cacc SHA512 4a6e7548262517df7ec01d5d9c1aafb5885486fcc8fec5307df4988fe61061669ca4c9748986566105c1a4842cb73b3e66f728972f10f9a38ac7820da8570a14
+DIST firefox-78.6.0esr-gd.xpi 491882 BLAKE2B e90cd1218805056066079b8be6df9806de5c3c3f79f1f5fdc2c021910f41215508bb45975ba1a47e7d4c55e161450625dbf7221597e5c0807fcbec6282c44563 SHA512 9dfd25f2b1b6365ad6ef165feaf610b3c7bfbb8f62c3d50b72722ff8ee085384dcc2de756209d6dfac5556275a6ab154f2d30f0a175bbc8212fbc59db8e38bad
+DIST firefox-78.6.0esr-gl.xpi 528403 BLAKE2B 7c4f9d965bf73e0d1329814ee599095e3d3da5f84c8f7d386b499c123038bfc64fff3fd9416d9292a1ba791f486eb92c734ddb21b8e31ba852456032bee52098 SHA512 27459340c305f99d3b51902ac7f61f26f2a4d598c45897407ad768135c243de74ca7d2fe87f66667b376e1f3dd68ad7afca514db21dd6441ffe669e722e05a58
+DIST firefox-78.6.0esr-gn.xpi 546471 BLAKE2B 55ca838b866f3a8b717b5c574cb7967309323aef02754d61a9c8d1d029227552361d20ff80c0c5f9c3296234c5f1b31bc64891cfd43566a74d2718deb702fc56 SHA512 3b4411e9caba2725139b6fb396972cc4fb650f7113b48034b71c32d919006b9a33843182626abd01b0a009f1bab63b5d369b98d593cb420cfac09318cfefba5b
+DIST firefox-78.6.0esr-gu-IN.xpi 541429 BLAKE2B 43cb58d64b311adbedfe882d9494e4ec9fd2308261872bacc54f7f9b84e396d9db54c54df8169f978b39a255c5f97bbb51eafed803ab514f75c47e1f9ed71747 SHA512 b4cade1f0cb0a1d05eea109d53869f8ba3c4ce3267cee89761b8d95fe7bc6f81a78f92ea6f22c1d1f638881f13c3517e81a41c16d777f32ddf9575f43c820e5f
+DIST firefox-78.6.0esr-he.xpi 545578 BLAKE2B af75950a65bcd4495c99de4730517392e5f86fdae25a5b7aac7c83a51999de30d9fd3a4c3bcf7bda83cc31e164938aeea7d18baf9a3fd0b7186d5b0fa590f8c7 SHA512 c839bbacb590b9efc88470938b1a464a11239a67fdd5d1c6aacee9c0e202aa492394b830feeafe83a4ba4cbe1a06bdbbdded8e41e9659e5ce70577a886f04b7c
+DIST firefox-78.6.0esr-hi-IN.xpi 567842 BLAKE2B ec9a0106bc7ecc3b861af18fe94c180b22cb64e9443963498daddc8472e59cd10beff9bb344335cd2ba142cfca0690aeff478086492c00717c2cccf47e99f05b SHA512 45cbd2432a2f5fa3424fd4e26449a3e66c05b18491e2d5bbafebaaec7362c03fb9181857d8e5d24aa4774ca07df7a51ace584185882d566d60a4c544e276f441
+DIST firefox-78.6.0esr-hr.xpi 522694 BLAKE2B 84b07197e17a78f296d6e899ff44175c6e3999ca92664253c9d044df93da6691d0f7d1e2b16c7201e60d50d0c6e8264cc581725d0f6f80cf8ca69c614257efbd SHA512 f22a5c64622e1829374f67780519f2366c5087ba6b45807b8b4763ff161fbd37421b293a8aa76043d9ffd037c90ad80b4369128d988ada55ebd1aebc4e75bde8
+DIST firefox-78.6.0esr-hsb.xpi 550668 BLAKE2B 302f9998e1340bab35bcd56b202fea583217e631df21414b2fbdfbb4eb575af2e5c7684466d85dae64534260da74f024a37cc6fed5e8bfe9e0023f4cfd5e60ae SHA512 4c337e042e0ebb53b01499cbed1d563f88278275111936c0f4ce2a6b2db9672d8f6c4c17f74afe967c83018ad6357777fb7e3ee88bfe860f5bbba08d66e9abf4
+DIST firefox-78.6.0esr-hu.xpi 554891 BLAKE2B 025b34b4b8dd9f7eead2b78b7be62a8cf8a5f340d66d8b328c6d65919b8dd087b657dc4344877f1e267c038c94c2e96ec3afe7349f4e806eb006da6fb9fc878e SHA512 cd2bee59551d8ddf4cb112e1716e38a792d709fbd99cd513e7f1c85abee7af818f5b9f5592cd4530714dbeecff10f87bbe90696698f5c9b5eccf3541e3336728
+DIST firefox-78.6.0esr-hy-AM.xpi 588984 BLAKE2B cc3b816936acd93e4df72692d666376b9616493b77da4f0391336f20369bbe5a930736ea16f64235f36aeb85f5dc34349890bc1e78c2f1febe7f4861e077a875 SHA512 4f02afe20a021698af39bca6d25f474cb85a2ea9f596a42fa3116eee2b7ca1fd2b0a30d7bfb0011424f3f2233cf84dcd9236bf9d076635c120c856ac01f005c7
+DIST firefox-78.6.0esr-ia.xpi 518819 BLAKE2B b5125537942d1e6e4486c2e7822270f27a5f1b2c99f47bfc3a47127379c324f1473348361ce0ffd89b008a8fb0e0e68b64c93e70ba13655119ceb6fe478ce6d9 SHA512 58278c0112d1453b506aa49020254cda54da9ca98a277c2aee2f1deb920af73def43ad0ba5c67a666b328ef7679d8eecf9f794c0e2ceedb159b6982cb0de5c8b
+DIST firefox-78.6.0esr-id.xpi 509561 BLAKE2B ea2cbcc04b9fdfed39cba912fd7c560feb8479cd8ce3bace9b04b86cb5b2c73d98c8873d100e19277101f127028ceda7bad8dba815effd60c68ed92f36107f0f SHA512 935be8c85dfd597a8c14cea8c5ef283fe3ec662f6b2acbe39937fcaab51ff10b4309d0ab0ec57de334e4b23737c2a0bd307537e5a158abaf71ff9be4c0a745f1
+DIST firefox-78.6.0esr-is.xpi 477017 BLAKE2B 0beb6e0369ea9a4e21d77c56bc248aa45dd08f0e3eb6dd47d2d3fface003ce6a55c3e46e5ed2dac56b4aaab96cff01e8ffb8f4e6616f1380e825441115267b8d SHA512 b5af6c290ae2c60ab2e3aeb30347fb79e933ae90f272fab4cdd167c2c4fc8129194c6b7a0dd1ef8012c27e39e653f4aa9b7d967cb35a4ccf9fdf4a0dd56eb7cd
+DIST firefox-78.6.0esr-it.xpi 449818 BLAKE2B 0f61527e8900e68408672a86897006ee58416c93e6b8f6b6e91484c01ffa13f0b1f6d3d81892ac89c28aa1adf119389f8c65a10bb3c01846bd58f4534313d119 SHA512 0c6a637756b0d8254aa3dc248cf2bb7fa797d3248085567d864672e0520f6e84d561f415f9b5ae89d44bfb00b5ae331b99aade9566f7d566b2a11bb1507afff0
+DIST firefox-78.6.0esr-ja.xpi 578205 BLAKE2B 1672a0b835ef0e00fe3cbb883a4daa855c35e27508be5d64ddac9e458a2660c67b014edb576fa6d1ab7852a1b6d196b082fdcffb707505793e0fbbd6fc453d86 SHA512 1a71af096bd0014f8872f9a0d077fba71796230881dbefd8213720cfd7643eb0df4b1e7e6acfbfb4e657cfe077c4643ae6f2616bc3abab2ef6a4172e4dfc9ec0
+DIST firefox-78.6.0esr-ka.xpi 579077 BLAKE2B 3ea15b41b333748a502f21e04801663e8571197bc82ea1cd8dda4f8e1508d09b2c8b4d054aeffaee158204e8fb411599c82db8563154ee6b2da12cbf0514bec1 SHA512 e4281dec9a84908fe567db830ccf14848fbbe8f9a6a7d80ca6fdeb54786af6bc1000af686bda1e514d8e2ccbe41653f4309e1fc8d92fa2de86b940d774889cb1
+DIST firefox-78.6.0esr-kab.xpi 539737 BLAKE2B 9eaa5f7481f43671488f82593b6ead90c0954c0e03d63733454c08b186cdb525e8fc97b05b84a299d1e4be28d35bbd1cb0382d95408599b8b1f5cefeb7ae96ec SHA512 fe8ae4aef0b360813038036c3809ffe7d04aa64804f91b4e5ec5961c44ec1416edba28662c7593e8cbdafa55f4c64d8ebbe10b5e0cc1fbd5662e27546fc96119
+DIST firefox-78.6.0esr-kk.xpi 593248 BLAKE2B a4fcaac2e4d157aa7cd6c8a6b83de4947533e9191e8eb1c01d5dacb4f6d51de46a79f776462970525e77effbdb0405c147c1ce92abca819dc7d2df910f3e7996 SHA512 ad081eeab084160ab5040e70e5ec79c9ebd0fb274859dbb5ef7254d710288792bbaa78e6c0d88ec5626c3c33bbe10891e90dd6c0fad83c704d265ca2c4bf6ed8
+DIST firefox-78.6.0esr-km.xpi 527374 BLAKE2B dda77a434eb3436921fa3be7bad6d287966ad9c10471d2cee1632a145b869a9549e630d146a176c075dcd5e3c9798736560865d7bfbeb8d8d7236d2f6b62f6e4 SHA512 149fbc0e0758695f4960f05f0e66b06c48eecfbeaf9f5b6a0b0b12a7ce660483ede3dc749bb732d714db6728a742a2519e5db862fe9be3335569e502100fa7ca
+DIST firefox-78.6.0esr-kn.xpi 506749 BLAKE2B 4128bfb925ebd8d61b7a442776bd70a3db2e4d6cd5b9674137ff6df8c853b8fc14ad94ecb74fa21de9af1781f9ab3d0558f3f320b869ed1bd27c227704cf3a95 SHA512 e7e781b0fb978583a0eec5378061fdf6e6a26bf879f04eb9fc02142ae84389b9298ace2a0151e6dabff6ed393498cdcfe5fdb558a19c6dafa99a81584ef50850
+DIST firefox-78.6.0esr-ko.xpi 567529 BLAKE2B d0fb575af603dd3a32d128375fa3d571cd724ab3914daa1d03963d93af29d7bcbd109f175be4454470a3c5dae905be9b357240c407f16b531e6e59abac7b6f65 SHA512 fe7474274194bbc0ceaba06ec5ee240ccc322488f1cccc41640925fa92716e4a053260ef68e85d12cc722d01fa82c3e9c5ae7c5fadab8cbb5e890ffb45fcc48c
+DIST firefox-78.6.0esr-lij.xpi 475234 BLAKE2B 5422c34dd716b3fab1172788a7542e36cdf81c7650ec03546a60b1f6edc69a4e1b3d6106e91a9c4c828e30f8ea09118232a561833912d0b3802427da5f16e6ac SHA512 0cb6f671157a8f172df0abb2d5bc1c5c067e51f77292d319b0707175af01ad4498c1965814445ec95d763880a6f9515e654c5971ce85ba695d9af9396eaf0da7
+DIST firefox-78.6.0esr-lt.xpi 540700 BLAKE2B a59e1487a37b6287186d77b01b8a5eaac82c8c675163d5ac3eeac9f8fade6713fddae9bf367d3840ff3abea2766e54edd7fefb54513b236a722135537a85f3d9 SHA512 56b9fe83c696664219adf69982dc7218b22103bed3463a505cdc95badbb737472780325e1c80adc3f975d93ae750ade65981e0fbdbe5be29b1b569944b05a8d5
+DIST firefox-78.6.0esr-lv.xpi 467469 BLAKE2B 5c73c248c6a0b42db92e3ea50a0c48173408e934c8f7d0d6a4e6e6e66a69cacc94c9d1d0b3121c09f84fd8f9cefd2edde49bc9ffccd694b225eac41810fc231b SHA512 f67485f05fd44a285ea1bb19cd6f089d827803072ad6a941090c8d233e751e4044e51a2fc1acd7732752b3da9e8fd67380b0eab5dc9b73d1f94c50532a848a8c
+DIST firefox-78.6.0esr-mk.xpi 460020 BLAKE2B a6fab7296ecd7f53affd5ba459c09d3fd60d97131d3e381621737cb44705493f93fadd526fdb7d0b71192216828a7d2c7354add19f160c58c5cc340f8ec46b3a SHA512 3743d9971b922448b86a9bf9d3eefcd68a73e8d554c49aaef580f9b4dcdd9b46fa8bcf21602938f51cae192aea16e9032a99a68ebdd890014c502e4f720a8b5a
+DIST firefox-78.6.0esr-mr.xpi 541578 BLAKE2B 0864f309366387b3372e79a2a36a7705830637c73c7f588275cb423c41cc7a7ff58c55ed1fd85f704008e3972b24d50cfc582f850725138d282e23dc99caf3cf SHA512 65b62ca0746f1175d24c0f9fab649314be63b8d8e05fe5c14046e3bdf291b4d914f8cbb60350dfe7129101d1849a018349c2a9ffdd18e0e633406561fdb16140
+DIST firefox-78.6.0esr-ms.xpi 453061 BLAKE2B c06556eaf7f202fbedf9debddfb0ff3ed17102183ffc44f69586274b699fb2d3a5bd386e3df9fa8be11e54dd619b5854ba9eb3b1aeed1c3a683cdf513f89b84d SHA512 d29324a64871cc4d77b324709917256cdc42f0aaa0634639e658ce4c218d98c43d166e2bea5cf0b2239c688772cfbb0ce609f7cb71cb62fab6270190cec3d1b8
+DIST firefox-78.6.0esr-my.xpi 526339 BLAKE2B 9f780e87e2cd65ee598e6f75929446d2e376691db9fcf4af2d8a39d97c0a0a8721abeab3feaca5e453262b879614dd34f37dceb0ee2d8f220553205e96a5c3ae SHA512 d46ba89a2c7571b5e00f57cb6ec0087238cbd4e3f542e0c4425f3a82d3dc5797f064330fa732abceff8df37836f470de8517f9f994162a959d856f890efcbab7
+DIST firefox-78.6.0esr-nb-NO.xpi 518523 BLAKE2B 91b3c3e6403cc4f6a88cd9f06b15766fdb561f13a3187e1b46dbac05bac65348a3e13a67d5255b5ab73245b08d0b92f67638803e81a646eb6eaa34f1193a34f0 SHA512 edcedcb426fe0ca706806a33f19a0a7ccac32e8b5f61861ca5639c305d4d86b3b83eebae98e75af59d83033cb878f6444b589906837292d25a4846f1cb570146
+DIST firefox-78.6.0esr-ne-NP.xpi 483419 BLAKE2B e20a4c02103c76f10121fe029dc7385daa1c957bbb1ce26ebed0c0b8f6d02848845883d2aa389ea9015a3c750ca837c3b7bef0866587f033bb6911f8b8e3d86f SHA512 9d55ba17d8bf185aac2e45de6204ae903e33a5953cfef78e0f46bd5fe9c88182d70380d7d212a49e229d54d87c1b45d6b127c005165f0e94ac1314297ab1ca00
+DIST firefox-78.6.0esr-nl.xpi 526208 BLAKE2B 9c4e70888eb1929e653c2a020c81b0dcba736d16833da749bb7c9f45c2174b8593aa8111e9b1063d774c5bf0271dc202beb0c4390ba856732759ca1c80c3c53a SHA512 3122ea673a0f2d24f789076bef71848a7e1d90ac6b40b85904d7072a5c4c11e0876959e30e38c525ba2958e96095a63c788c8c2e81354954e9e9a3080a6e80cc
+DIST firefox-78.6.0esr-nn-NO.xpi 520168 BLAKE2B f550fbc5c2cf1cd10f6fc60bb9379a5a89f53a144141a99b79d6410eb7fda71c4271ffcdf0968a9ba8ad105b55855aec3766f23c43dac6eec64508a9ade091f9 SHA512 8bcbb42f799b9f221954de65322b6e3a1bdd8e2ff91a624e9cafb28086573b0671b066b552e8a29f0f5213b367a33c9fb0d806038272f9dec6eb4b19c7ed56a4
+DIST firefox-78.6.0esr-oc.xpi 542147 BLAKE2B fbc94f5428e513b1fe37e4bd9bc883473e4bb4180eca53bd07115b5e3136f4ce7bfc4dd1d9516bb73a2373f8c775a413c981fb7c4b51ec61573486ddeeb4a9a7 SHA512 213536d1f14ad15d07eed1f991ad5c9e125f4f6e207ac70319393c56c1e4ca083c9bfbaef98f95407f1d30211a532855002f0cf2ed0f3ea90a958802fe06e338
+DIST firefox-78.6.0esr-pa-IN.xpi 580353 BLAKE2B 966537e3ea4bbfe6854197dc77fb83412e21acad194eb84ff263fcdbb964540afd583dff05589625821591b82100db551b82998fdc5743843174daba4937b068 SHA512 25706c4ac9867989cf4b86d3995947e1f343dbbc449cb60c0b254e6623bc3939138c27e473251f2c63eb879e46256e1d8d2634991458073c7d64babf27b62ef0
+DIST firefox-78.6.0esr-pl.xpi 545607 BLAKE2B 3bb2ca274c36e216eb0b961d70cac168688c616b1cbdd30e343b521b469e0b7134e2f613d8945a7cf8e8f0a311bf3d3e7edff93de8139a3083613a7a1d73f2e7 SHA512 eefd9914b003a5c3a0652e65968a2f7bae9e882f94bb4a4289a2b4a55a456f647b7cf8cc9c3182aa70bdd8b9b3045fc8a8dda0ca023f5cccd08d4d830a290f36
+DIST firefox-78.6.0esr-pt-BR.xpi 527569 BLAKE2B 4a45298aef23ec32925cfc995ba399609285f9692848865415f4d22042fd19529551acaeec96c0cda214f22dc055ac980932f55684ec26a20fcf7d64276cde19 SHA512 5fed281c22cd04c84c441fdb9625672a5659365fc5c6d12a820963b8451ab1b6a080162323ce0bb128e4a446dd75b154b6a4f86a71723f27f27465d6bc6d1cdb
+DIST firefox-78.6.0esr-pt-PT.xpi 532038 BLAKE2B db14188ed6a1e8d4da0c3a1aa3516c2af0c0f79951118e519a30f26498948b4d8aae8caaf3fb1d6973c62b4f062b4cce6bddda2ff290347bf606ba43639b6b17 SHA512 2930c49b06d01c4d831e50137934ba8ffea5496ca3015eacc8e05c5bec408f84db0d021688c1abf4269243fa87e4675d7a6bd01c1d3f30957759f38c9308a2e5
+DIST firefox-78.6.0esr-rm.xpi 526718 BLAKE2B aa4be7fc1759a99e288daf232fe0fa8a46237a11ae52055d3ac276716145affc0dc928edd11124e40545b0eee2c8f32426feb43ad9468103e57dae9652de8d8c SHA512 96ef163bf5c6d1adaafcfd10927e57db92fdf8148cfdcb0b0cd90d275fcd4d197ce302bfa75af9a4e46fd37a97fabf41a6cf46de33e56b3566456f5daf8f1ea6
+DIST firefox-78.6.0esr-ro.xpi 535577 BLAKE2B 00864a60791b902b01afad88a459dac4210fadd5565bf5a640bdfe19ab1a7142ad92abd50283f2a47d35d0dcb206100133413cb90c195a9908d389f47d9f1e03 SHA512 0573c5ccdd4c2fc8705b2d8e2bbe296655367c634734d499cef15b20bb0aa797b9cae317208261a9edcc9d195b59c7e0b59e459efa5cccd722c17f7f42567ac5
+DIST firefox-78.6.0esr-ru.xpi 614609 BLAKE2B 3d4dd1130c4355c60cc4a02e2321b5dc9b227e9c01924cddb27bebd1c5ce932c495d351312f61b01c3dcaeea7be84ebd4da3ed5c075861d75d2d3923a86b4afa SHA512 a4f3b7a0c6b7db43f91918eeeb86a10a466ac8db31bbb482b420bcf0e873ae8252d9f1eec0da6de3b710fbc4d62922f7630db2bb1728d4d36d479d561ed32182
+DIST firefox-78.6.0esr-si.xpi 492524 BLAKE2B 9660f01ab1c17d4123d819c799b22f7ccf4209194981ff8a9f54686117d3c904f212a717ad5578787b5e83f2c6ff9f9e21880aebe2c7357f145ed58fb7708fdd SHA512 dbeeacc5f6d770b0ad1bd036bcf0cd4075ce29184f944f093d55e684928d384fba446e1a1b059977956325a8c391e9b80102034af41facb0fe68fb69822ec409
+DIST firefox-78.6.0esr-sk.xpi 534225 BLAKE2B ba6956a8b3b5c41697fba77a0aeaaedafc828024c8ff85b3766ddf74587066c0b3199e29dd610da4d10472828506c150a922ef0ae72f21462291fd0a3db4fa15 SHA512 142eb907535c78a83c16717d747a12182ebe94886e90f04ce5c174f606fa9065d5ddbf9a19dfd5037dc5907c7ce439e54b39fa7b9cdbbeb320823e7e938c7355
+DIST firefox-78.6.0esr-sl.xpi 520941 BLAKE2B d46077d22ce722822d6e95991e61b2d30ff4a058d4f0a215b9fe7fcec95503595123498317e61967bc89edf52b6b6a4e1097fbff0737ab5b9b1fd3911cb36727 SHA512 7c0ce61b7566dc0398c3917147011ce0d4024ffeeebcf1180050bb11a7ed94e46461b0ededa6b48fd5a15386deda40af72365aae5033b74337b1b7411f0a9c1d
+DIST firefox-78.6.0esr-son.xpi 424586 BLAKE2B c1b6f14f988b592e7147d6317439bee8f6f5d1339b7c3d728d62be7a19bc4324ddae28321d432018daa53111348b449a56be5983124df8db995706d4e805fa84 SHA512 128aaa2aabd6d5583e55d2b382c4866a95bf7174a8f4398876f9deb63cc65d5e6a0d129300e559e345c2c1496797e38db065c05d14fc7bfef52fc5fef645b05b
+DIST firefox-78.6.0esr-sq.xpi 544905 BLAKE2B 68104a44fff0ef8a702d63c6dec475c1606eaa17fd8a99e2a554a873a3544957d93d21744c0d42a2347153bec1e31d9ba52c403023306919a6a4a7a6f39500ce SHA512 c355101f27223651eee207e444c908a8f6e74369b18cb0f0711836cfbfb398e0332f31b45c42bd5e0be283c86b50dbe9c3caa45ee982a4927d015d57b44d4d13
+DIST firefox-78.6.0esr-sr.xpi 561373 BLAKE2B f45f471f4c2a53e8eb881e120385a4523941988da5b4358e36206af0b9b5532e4c389f8350121eb4119ef855165038b2def6b16fd12ff9d08474fb222d1f31e2 SHA512 cc76c135577b505b527d7c6c8dd7f2f98e0b80f24dc4c12e00bb2db9877ca5d9afb4a1168ceff484c2471c84de4c3d63a31621802bd43ff78da547daa252cb26
+DIST firefox-78.6.0esr-sv-SE.xpi 529703 BLAKE2B f52679a45466ce11cc99e05eeb64beb22063ea6e1c924e8a9e79a7669ee850f30b18be2a0860581599afba65df9ba23a648da3aa6af168044a43eb6957446539 SHA512 b54649a444c5431cf434495eda36c31ca3de952bd461917cc5e15a2f41232c78ca843b2eba3b7980c1947a6c7302ba91cbaa9d8608f53e30dcd1978c71b47fcc
+DIST firefox-78.6.0esr-ta.xpi 521530 BLAKE2B c6743ce28e0649ada85862550d2df6e9e04ed171d9416c3d51511b1e3590eff42a3333a53e1219415fab245687ceebbd2ed9f9cea5c32b5676eed51591f9a212 SHA512 f52c85b6ca6b5eb285f79bfaef4321bb134d4a07143ffa0cb0b041e0491fed96dbe0777043c1b86d01c6ea4f951ee1f5515361c5a4651c5e494239bdd3786e64
+DIST firefox-78.6.0esr-te.xpi 558415 BLAKE2B 49ba51cb730bd7e5ed2aa5efa3c55f8bb35a7300edcbd52db442658b3d5628bc824ff860a9c16fb764580d26fd9940894dba21cf3fe402c08e39f06fc1094e5a SHA512 cfbe50e26f4a6f6da1398e07edc0b1565230d5fd7ba69b4e7e3f508d845be5d0d8fb3f4250e03d2cf9bd5b69ba1b2d4c54f759602dbb94a5540aeec51e5598fc
+DIST firefox-78.6.0esr-th.xpi 592236 BLAKE2B f01aac98dc2b431f829b0a81119158f2dccb323c7ff7a094021c04c1a0411bd24d2affba9399e1b6768d89e576c555984f68dc7c16fae5fa1f8b9f74a002665e SHA512 76f2fd8c616d04aed8ac06918fa4292e796980c4f48130b6678f5d061a487598498c7c1da7b58abd99fc0a30e5bcf3c9958c332723e2ac5fe7a860c3292dbc16
+DIST firefox-78.6.0esr-tl.xpi 521106 BLAKE2B 42ee5a5f62b1c7f12f8aa26a8918fb9585ed7787bc560bf0f13684f67274e6aa0f55ec0d063f0d6a892bce42658bc3811aa51aca8fb8db855170461a4791f724 SHA512 082ec4a3c1dbed82d32871e85bd0051113b99553303c955a41e63965739b3ca679fa7f62c21f463614e78aef80048e30330ed152fbf8bdbd9154e22558e7245e
+DIST firefox-78.6.0esr-tr.xpi 539861 BLAKE2B 601a0aae22103ee7637657b2f3e092bec8353b226b86982e82b98da8e1e9d80de17048f38567e7b3e49fde38d18e598cf07c23b9e804876053a7c89d7aad622d SHA512 4e23a5d4f97fb856b6c5dc4bdbdb444217926de8ffcd1d4a53000de77e858a476b9353bf941f33b2299cf2b4f9ecf63c0792e3c2373a47d276f1cad76895b544
+DIST firefox-78.6.0esr-trs.xpi 501215 BLAKE2B 1357d628a32cc0cc52d59af3bcc56bd7ccbe36868feef8d3c8ca6f9420c448d1fc7e689b0bd7369b7760040d16750317ab4deba7bda0c4c389ddc90bd6a1ac88 SHA512 3aef0dde430f4786ef03559b83fe633b82bb0413657c61e005e5a13672ee127ca87a77a125ea17c30e459aab66912e9a5c215665c1cb32c4c7e11723ba0944af
+DIST firefox-78.6.0esr-uk.xpi 608588 BLAKE2B 3e2754d8b83713963b01cf277729c7b94c5b1d46e2756bc2b6e7846e3ecd6a7d203c0e8cb95bc80733923286fbadd46fc8e2c92733290c70b2b729c439316f15 SHA512 7ae8445b07a6a5bffebf6fc3ef1ee1b19bacaf2af0979408bcc0b143c1ee08d8d4a328835e1f030e047873fd35d4118a9fd4d63ccb6cd76de7b4580f4aff8dd1
+DIST firefox-78.6.0esr-ur.xpi 557952 BLAKE2B d2a58c7f780afbadbe19de5b991591cbc0dbc5a3b0bf49dbdd4f51bd7d20a0acc7234b281b033cf58b2f3b61ef52a0b5a7555e2bee0613e5b040b639b2a8e8b5 SHA512 af9efef7ee96b9d9cfb3d06e8c6f7bc81cc076e15edeb75d3b9f1d32b8e4e3de3cbcdf9e383e8e21960fb7e5e973274d280c9fcaa5e06a6703ba44da0a3211ab
+DIST firefox-78.6.0esr-uz.xpi 477554 BLAKE2B 982b0c92785e86e2a74e6bb5fc16803d485d2dd4b99a65917d438ecdaf46478ac50ba8261043dd431519be1114c802ab32e917792132f8b1fb58e93242d24c04 SHA512 1ad034dacb33c57cd22e573c6742d03ddf71aef57ad93e5ab31ab456aef8794d2902e2f229cdcda600e604239b8241662b47af40438e8d2e8c095ba135f9becb
+DIST firefox-78.6.0esr-vi.xpi 562855 BLAKE2B b044389a59b2f846596009f9eb7dfe08e6445d34a65e400e1e792cd9430a59b47d8dad19aa54b12fbfc867211cae166d582574976d78689cdf0cbb2782e31150 SHA512 aa61cda16ee1be44ab909ade183b56120fd713bd13014b9811775aad4fd9b5a530a0ef341b9522bffb09c6dc1d9b6358b260a00907b8e954f0af3a7c65ba137e
+DIST firefox-78.6.0esr-xh.xpi 427847 BLAKE2B 4cd2c5e073201dea0c1b2163e3a9196345f6eb542790ed8b2147a148a294505f46437ee084b593be406ee26c008d89ecae37454334aac9e5ab66b6485d350957 SHA512 6dc63029388d03d3094146105fe31b2ca7feea2dfcc32ef6a0d3face10788806b6309210a6f7ac63921390a6972fcca1a0c034797d1c872ddda82fa96b12773c
+DIST firefox-78.6.0esr-zh-CN.xpi 564765 BLAKE2B f275015ee431fb845dd6cd7e3d77c18362d889f5edc618fd24c78267871c284e7033dcd08894b8f0835393fd4fd4441b3c2bea109e3fd6e93f477ec5ba0e33a7 SHA512 1be7b1b28e0d6c5287b42f3c57c0576475140fe4e9d2a4ffc8075aa72a81b92a835c7c44b2ff8309719bf9e290f5447bf6676ead1efa911940437c407606c132
+DIST firefox-78.6.0esr-zh-TW.xpi 564720 BLAKE2B db85ce7cd1802a7b609638fbcf2254b276192dfe28f5ef874baf246786f9f55098f04c6260cdd7af1a5482dc2db0a202f879e8d59ae13d1c739d289eb19c65da SHA512 39fd8d7c16d608040f6e0823a2b221ab0d02a3265530ff1058707973904c6a92f8b76db6fe38d3a7ae7c8bcf834f9ed46418f92387f88b5466541e44b964e5af
+DIST firefox-78.6.0esr.source.tar.xz 338098664 BLAKE2B 9d082b6104bffbd0d918dc1adf2a01ac32613d8048faf399177834c4949714a00c1f4383b778a21d6b6684296d8f9bd44fa547ee2507a8631d206e3764d2ceeb SHA512 a1e2d6af0020784d00ed3cb4d778c136685e7c2f6ae536cc270fbd331d51d483d17dff9acd7ad8e6b3b231b9df894c146092889357b23715814a080c6f08d11a
 DIST firefox-78esr-patches-07.tar.xz 66156 BLAKE2B 8f69883432dcbd484b1fb15e3fde1630b1424e502ba78d9ec3cbe70cb2676a6876853d3477c8bfe35e92bca91b200e2d14543de1778d895676a52d2608109af2 SHA512 b4a01d3499002bd33a7fb45a1a80e9e73ba27a0986b6bfa43b3482dd8d82a686a14ae0c5e013402c8c8f359a642632a40bf4c362a0e83a1f53b453914f42e3a7
 DIST firefox-83-patches-06.tar.xz 152572 BLAKE2B fdb8cff136379320ee35b17300a91d800dd7a0cba938fcc9687a8b0da5bdfe04826d3cf7398ec8c3184a64f44d39fc44693c2cd6c3ebed138f84536be8e68ce3 SHA512 c195036f84071db1c6ba9a2f9b2044826d7e094bd2525dd149666df308e7ddb39c923ed13bde0812aec3904504dd913ef9fd3f443c098d86c6c0d51ce172c3c9
 DIST firefox-83.0-ach.xpi 463987 BLAKE2B 2173c637ae155ec474d18250adf8cd67ff7732ed9ecc7533004296934f82dfdd2f83f5f59dbd6b095b519bf5d3caf888f5e07913004a27771a13376ac080978d SHA512 cb1644bb1451311923bcbbbafe727fe8b35c33cf9643dceac603e802b82a2684451f9005ef6bfdd1ddebde01548926eb62dcd511e1f8a960248ea5b74f5f72e0
@@ -193,99 +289,99 @@ DIST firefox-83.0-zh-CN.xpi 564100 BLAKE2B a9b89639386f0775dd1a6ab99551a2e79fbaf
 DIST firefox-83.0-zh-TW.xpi 564079 BLAKE2B b985bd680dc620313cd217beffa87935a546e528a37854fb20a7f4cdebdbf50fd4858ac91f13bf31eca947d09de1a2a0b9956ddf5acb6978e3a7a7d8628be0c0 SHA512 d5eb2a32cf4a5dc675adae6590c5201023387df9a8854ac4814b601c413c3785ae2e694dc5b4d231e2d1686b386cde202066cd2f11c1071dc29eff81c51e3abb
 DIST firefox-83.0.source.tar.xz 351331940 BLAKE2B b3a805288f4d644f7375c78ebe771c26d59c57f6aad71877abbfe60563c06af5f162b8894cb624cec12a5c72542ffad97e6f8f0cfc3fba0506d4e246a41911e1 SHA512 4ac49cefed278d1f898907bbedacf81ea4bb4e5784f567d4c0971d9cbc2cf4a2e4472de81a7ded620bc3a516bc972d600b516b7674319cdfc9734c3824a9a2f6
 DIST firefox-84-patches-02.tar.xz 89512 BLAKE2B e1fbdfd2f2a0a128f4107d2db67e4abb1781c35704c1364c5f5527f8100c9063648b5cfc69086923b3c204fb883570ed901268cbb3fda2880ce923eaf7b2dbaa SHA512 ba96ab662c6b19be7ab99870363816b6a10da29d4743a2196e39c1b5ae2f20de28d652249484a3dc2ea259e0e9393b034300b84fd42f28755610550ba29db7f2
-DIST firefox-84.0_rc2-ach.xpi 461782 BLAKE2B 84bdcecd194a37a5e7f2bfafb56de4e2b1f322efec36a4a5b3d861e340b063c6d739751cf06c09b746bcd9910aa6b5df24738f3b576b792af88f9b3ceb94d770 SHA512 f8c912dec04d784bff81fbd32bb7cfbca83c187f4ee7f730cad3224e6a9f981d89b321f97b7efa1559f4da5c67877005d708188b63952ab0763b3159d421957a
-DIST firefox-84.0_rc2-af.xpi 429055 BLAKE2B 15fced40a0c0f0626d75eb90ec4d8309b32204f262b03a0c2df00941530dc98bf28c749369adb144b74f0bae60cdbccc9159ae89b06ddee53a82d42af8d7def9 SHA512 c3126d78b838d0839b673dd113653f851152fb14e88c45536f3012089d2c48c5d01e0e113ef69da7638f702a6fe8430c920e4a805b6e2641e58871c880e80e0c
-DIST firefox-84.0_rc2-an.xpi 509097 BLAKE2B 9fec3c5f31e37a255944ca0aa6e085de425615c2af58ea9092a4242737c9b13837d72d3d6dcb596dfc6cc0e1d651c97d98c8a507b653b9c35aa1eeeac204c2ac SHA512 b7588064c7ef173f3ebf1fc72a1a5fb295f2e223d9cd00e3a116ef05d614bf14bbb11be806f57c8e4a7f70da155a4ab959bada7be5bfcfe9767526c1f510fa6e
-DIST firefox-84.0_rc2-ar.xpi 560423 BLAKE2B 0115df8011b679a413032f86935822dfe00397326bcc94e3f6d61295fc395ec1cc3ffb5a362f0a34e04dd907fb9d43538faa34c8a340a4d185488eca567513b1 SHA512 ef27f556f03d441041aebf2bc99b588c3024bdc8c4ae1746c30eab12e61a83cbd926763beae0ca7b528f693641c4f41fa0747562719c8f80e5db1f36e2b9b956
-DIST firefox-84.0_rc2-ast.xpi 457475 BLAKE2B 5ac57b38823025182fcb118798e433d41e0bb2c34c4434fc1d45cc2900c5f3e7258b0d5740008c1275637c8d53bb42a29f648422c99222b7abfc20825e1069d2 SHA512 2e4231166b598c31fa66e2be3243b09203678ec1f7b9d793e92e5a3c1a0408ce7be184361c46c8a30ed1dbd69bc987efc044131919c8d61d93c5fbaa29963286
-DIST firefox-84.0_rc2-az.xpi 498628 BLAKE2B f216718470d8330a3fde18f99f9bb5b5deeaaafce272416f97e01e0084b6cfca2aeb3ae1699c0564fa326c7d6a7afcd2840304a543270da295e73cd512535e50 SHA512 eac3a0f0f794de2ca1e236733fae8350e994e7410d3f59e500a74412fee294225884179222c14f5880d5a92b847ee7094626bba332b0809972347997c96ab92c
-DIST firefox-84.0_rc2-be.xpi 606518 BLAKE2B 7a8cd9e2357e7daf2e5f38c92f6b865a9162a8c80f71be9242f8e33e9beb85b149f15199ecc11573a45fdf1edad4772f3e6d33855e3aa230d7b23c790e7b78ff SHA512 38df8548454f6698c9cdf2704aefa2de37abb31b0b511843621846e71b8202acb7a76abdd90e75c379da1f3b26eebeabe34b8acde6cc4867752e31492d581cbf
-DIST firefox-84.0_rc2-bg.xpi 556446 BLAKE2B 4f1cc20d59da4d05b2bb79b64820169d96a72f2821e7949d670007d4e67b2a3c29c5591b2ab8ad934f91ac328baf0baea3a104b28c117383678cc16b69328f13 SHA512 46533e5376ef90f31aab2dd5c2ea0a3a4f06e4db71356ecd064918fc6da3355c48cd7e6de1ddb0e4b0c450cb7896918588cb295762d12e9cdc881338114c4ab8
-DIST firefox-84.0_rc2-bn.xpi 573381 BLAKE2B 937eed4b5998d8fb414e3f592f3866580b28f87398b33ca620a59154cdb63b9c1dde57a4f05913621d70e4bed09a763e2b022ba8ec42b394779ed18738a211cf SHA512 1eb83c0ab9047d9c610a6bfac6749847687afd6029a737de4dcf256ea02590d723da857ee9e2062accae6b93eb66bf204aac479605405faa619b490ce6398dce
-DIST firefox-84.0_rc2-br.xpi 514068 BLAKE2B 329021f731c9491f751f8fcde0ffac1725dea2b75c1e8435ebb8857b3ad6066aecc8a42e87b1a71c5da2be6b0340fd26ee49976c4277a1fe8510684e506ee894 SHA512 cf2e9b139b816f240e8887f517357b38879921b134e92fc76321967e9faec6e57ab729917c136dbadcefa4f959f59f2f72bef641c0ffc3ddd82f6e765aba8f06
-DIST firefox-84.0_rc2-bs.xpi 465259 BLAKE2B 5ff4d7f0108e546c11236c8c0d3f2388384d29292df7f307a940d32edb9ab665b31c4e954f6044441f850747adbaa95177a1c054efc193eec9a38ba82e6d6ba2 SHA512 ea94c6682936980ff6f4a4dd6913a4e7f86ea20e94e1e4a5280aa0f7878f63e6a2c7be0993ac47628f019eef1b8a22f37f79968ebef1e50e59563a5fd2a8666d
-DIST firefox-84.0_rc2-ca-valencia.xpi 518024 BLAKE2B 6f92f54d0145227874e0961f6231d5d4a30ace615cbb32901d964dd657c7127924a91b4cdc2ec07111845e68297174eb2f98a6c686ec8b2aa709414f163c8537 SHA512 bb4d2495272c55de39cc80290dd471b89b8dd2f4927f4ec5c104055e14d09d197a4af9c99e6a846cfe628d0abfc0ec5b1a432281fcc4668a33bcadbcd498402a
-DIST firefox-84.0_rc2-ca.xpi 516048 BLAKE2B a2f62b92130384113a9d65fbdd75cf7ccb29817b93f51d153c81c74ecb2636f980f374c3c219a25f38763185fa8797f86f0268683095bc3afd0a57972bb1aa60 SHA512 e684febf56ed3d40219cf2ca958406fcdaa0a16168cd9082cbbd1ba22625c0250f2fbfc724840f08a94d7f7823123a1b4c2bca7b955aada5679d877295ffe893
-DIST firefox-84.0_rc2-cak.xpi 549485 BLAKE2B 74a7c9c06a7c4fb2235ff5fe51ec17fc75c7ffdf58bab72d83559112e55606eda022e5751f113e3ac2fbe51dd8f08f3415bac4161a71e77b4acdb6ac6733d6a6 SHA512 1df79fe13515590090d66bb316183179f542da6f06d6dee577aec200a066cf4b4edddb9a49a5b48f302a4393f1451abbdf15f669e7ad63f918c899ee6b7e6b44
-DIST firefox-84.0_rc2-cs.xpi 540237 BLAKE2B 911d963b0075fb742b808127bfec3004b1dd98e759b36e0fa75899a42a4830e3bde4c585585b3b3c7bd9db350f847dd9b6ddc641974b37341e5951efd841427f SHA512 99ecaca08256882ff399240ca6ee28e2d0f90495e3513f66578811ed6a7173b28dfb10e80864a04e2f2d90748f9d2d8edfdcab0c79a661f84b2c296375eaa657
-DIST firefox-84.0_rc2-cy.xpi 528806 BLAKE2B 49e20f57044aafd440fb8e373362e1624c261651114e1c00cc1253a8e164274ab409b2d23cc0d81c1715fac13fc3a9a96742de06f81b27d82036e449332025b6 SHA512 e5cd1effd48b5c11b3ebf90f41683be05eac91a696c9b17d0080a2eb6da8ac304e01f52819be35377323198a73c9961ec5ee1a3b79ffa2b4bdc8e567550b25f7
-DIST firefox-84.0_rc2-da.xpi 520967 BLAKE2B 9e4eb274e1ff5111725e702f4d17f10e3ee115fd5662d184dc78dfb7a43d6c203806138fb71daf9ec650ea7623ff0ec25eeb2ecb850ac6d47cb573d0d061f3f8 SHA512 11083848657ef34574ce60a53b031ed50428d8c014044e4c23359351c5557de1147a1ce65e211b8bd50b7da9a06c78a600fad0a1de073088149501df2074a491
-DIST firefox-84.0_rc2-de.xpi 540878 BLAKE2B 81781f04940cab3384f687e02f670141f85a4748cc45487e85355f1bc7f69138e6b83c60dc449d9113631dc0966859629d2b196a7a1525f7361963ece317aad0 SHA512 4609df0d2a1cc37860f906fadd730050f85a6e1abaf63d40c10ef823be233f795879b0e425a48533ee8b51fef18d290922cf31251916c5272a70fbcc0a8a5d16
-DIST firefox-84.0_rc2-dsb.xpi 552194 BLAKE2B 8dc5301f09ec189c7dbe2f2b92e77d65b2a7bb567edc8cd718eb19e461726c1adb2f28a65231781658b2cc9db1e765559ef8fa2d3c9b968be32710af755f9844 SHA512 665b70959e6664d76808b197f192972904b7646daec8e18e8c3f3e53414e0d016c05f0fc1a1a03c5cc9573b865690cc7be606cf69cf857b6c28791a252adc154
-DIST firefox-84.0_rc2-el.xpi 623759 BLAKE2B 16dfb6ad3a6b031a2191703f891f163b03dfee795f240dad820180f2bce703a67c649fbbf32d8b4ba089c8225004585a3499227ccfdeb63b17f0e63084f127b7 SHA512 5dd6b636521050ed39bc5ce578cf868004f3df4ae4e928b9fbb6e8ea43ae1b7d10c117763f900ea3732723848b1a24bd7199cc8ae57d9e6c7cb363816b8db479
-DIST firefox-84.0_rc2-en-CA.xpi 495297 BLAKE2B 6eda43e4fabc0b810db0d5fe73fd9b75af7eda741fd0e9ea02044d19126f70d73444476ad3147c579840d06749bea9bd73dd2b4fdd5e049b121ffcd17653b2f7 SHA512 1376f97986e9f3cc1ab5ba3c35f411fb9a2fadc51ce69262e2854f9cf15849e015219fe30695a866d195522cda6f92d30351265bb070c334555c7d3a4454d0bc
-DIST firefox-84.0_rc2-en-GB.xpi 498711 BLAKE2B 71ee131bd910db8263a1693ee4b85d119684f8db9014b8c999b4e7b5132f9d7bebc2d1fa0aec6dc7cf1115e6e078a3dcce8db276f0415987e696afd899cfc1af SHA512 1cb5291fa3940a9b264d3d76a375484e311f211c3788d08fcc184af26422f7f011caafc6c12257b25cc406fdc1496a1af54dab19fba3b6858aec095092b86847
-DIST firefox-84.0_rc2-eo.xpi 523250 BLAKE2B ecbd12fbf7177f7115335493b35d0c1ef9f0f80047ff7c1cdda81e6d071b7dd7ab5b194c6c3b4d982c2699a38a2c9fdf6a698588bda390c528160b1a6434785c SHA512 388b85e1210fec6c7bda8ad24d5823f2bce3f64d5c5a9786c0f3f18265c505d2741cf6771cb115a28829ac82d2107f4cdee00ee80a058e2a093517deeb38f14a
-DIST firefox-84.0_rc2-es-AR.xpi 533690 BLAKE2B 2b0650474173567d19fe748d3c7efbb05236db428c79862f81ea27ad28566422710414d5a5955aaf5de311886a08f1f9a27bee3bddc3e668ba82d099b7cf29c7 SHA512 c118b299a49262382e92e8d45af703ed8a1698423bee1ebfdaa45621362b81d75a83ea6795b76a4b4deb11786cf304b66ccdafaea339683d69e49fe4f6eedec6
-DIST firefox-84.0_rc2-es-CL.xpi 533179 BLAKE2B b5ffd7c0ee7b430c91b06fa67d2d693a6d8f756e66e622f442987e3ff17608d9ce165e066bf5831573acc186e987dc78a8ed1a187e96eae5a8f146310a7478af SHA512 8f72436d4b729c90f45dbb54e63a3daf649edd32ebd9b41f0bcfbac4c588de0a27ba3c1919a0e24b63ce5eb78b584a4d6d4849e25526135784b49c00ab413c13
-DIST firefox-84.0_rc2-es-ES.xpi 523075 BLAKE2B 18686c0e2fffa39c57477b3af7ef41af841360528291ffe69134c485b770104ea3fc9111728f181589bb7bf573a2be12563c6b4b0ec7fa987cc8166942ea851f SHA512 dd352069488fac98e6d0e25fb3fe22c8de27b5a98017282465862688bf80b1a269d35067ec29fbee7821fe0cf37ad2ac48f2f78c330f057b65c12d8efd57d63a
-DIST firefox-84.0_rc2-es-MX.xpi 531352 BLAKE2B 23f40903ab55599da3e7b05993fb8592123f534adc16f72bb20511a1c3e4968eb2517bcda7674640e0e73f1871c8bde9285a0a67896272fc49e555e5ce88071a SHA512 41f763658f5c2d695e5dcde060720d44a0525cf90a4cf388e0176c84e34f88318924ee2bc3cb6ed7bc4c17c0d6cebf5ed2c6a2bc68a88b7636095ac54614db78
-DIST firefox-84.0_rc2-et.xpi 486956 BLAKE2B 9e1cac6ea7282b9feeb3490ab2af13a7d1bd811102cdbc6d8e5f0d515c3bea4d29dbb96b51af1855016dd074c06a48780a6066d7220e503d31e0094e4139a731 SHA512 c2147c091c15cb23bb46fee8f49b75b83b6a52d9365bcd547346ff88ace5abdd8fc8fe8803d3a406e50c76372963dd1384512fc4a95a697d3592505885b25a63
-DIST firefox-84.0_rc2-eu.xpi 515146 BLAKE2B 76c18f939759f3a5c9ffcd15ebb20989981d8afbd558800a9053eac8232cf6f4e3ce5835b977013556498613aeb768e079849a21f007987e73f5f0a3639bd793 SHA512 8b2d1433602759866bde880be814bbb72c425800484dd3e14c7a4297f3cd5438643e8566083725b74f43547108ddf4ed55b8be8c92531ef6a156d4e77ba8de80
-DIST firefox-84.0_rc2-fa.xpi 539669 BLAKE2B 3dcd55ae21ed195fa8cadb7175eeaf6a1eb885c5a5823d8d0ca745f3f05b7d4823bb7ace5aac711bce60ba14a88de28176e57acc9f839faedf933a3edca5cea0 SHA512 5f12a0ab05d16f72d353340eb5703ee2b0271e6474e7dd7b6cec2f09f7cbecfe1f03e7fb21271f64f5cdd29eea6ad3c7f5129111fd5847977c20d2d0976af1a1
-DIST firefox-84.0_rc2-ff.xpi 483215 BLAKE2B d8c2ccfe15b11849edbccfd4c845dc6a2fd84790318dc35adf814e2fd92eef69bc9c9511c9ff9e285c765a99501aa69169d8fe182553ffdc47b19693deeea03b SHA512 0479ff9398a13a14f5d4b29010ea7ece976b9247d0428b84019f3fb1678641026164b16fdfb055ed2dfddce2d558d235309e15ad6a19974aa18d4349ee4de3b3
-DIST firefox-84.0_rc2-fi.xpi 520032 BLAKE2B 9ed493a7b8803973a7b409eee2cb12942d66f91a7b1fd660fadb0476cb085d357c17657b35f8ca550a05c6b89d93b00956e5a65a99d7919a8f39af94e13ab7dd SHA512 dd6e3e07befb8bf70140c7d2198234caf6bba80ea8a06ae90316f4378d701e3e1ceaa4c1dffd6f5d61812bb706632b4ca44b5c0e20551c35e8c28d00615a918d
-DIST firefox-84.0_rc2-fr.xpi 544370 BLAKE2B 588c217b9e63d3a38cfa8636027faa4c1a9d576afa4ca8dc10d7b5566e4bc0a9c8e42e47ba7077d99a61ab851270f627b099d32019506208afc0825d3766af4f SHA512 d64371fc05bc15345dd90dd4737d709086d7ded2503ec7da7cb35eccc302381239429d1274c1e1ba0d7cf82b4c978efdb22bd4837011986c4197804c8b26f354
-DIST firefox-84.0_rc2-fy-NL.xpi 530307 BLAKE2B c6096e2c2b35305038d830c00c7dc73e8ae3d579255beeed14383c7b62f5ddff9adc692d826fa20cbe5f531e384f8f88e471bc66a89fde656fa0c7c8559e8906 SHA512 0b21d7fb5004e55c1c4be688bb3383ff3059d751fd23fca745a773ec627a06b1d7f56fd3e0f486394a397c722c5441ee1c755af3fa86d11640b567cbe8208caa
-DIST firefox-84.0_rc2-ga-IE.xpi 468075 BLAKE2B d759b55ffb0f398a9deb762c39ffea012ec85d87b455643eff3c1ef1b3a44577107fbf1ef8956c0d74d5e1bdc7581a1bd7473dcf1fd312c914ed023e839df445 SHA512 eb437b5d6c4089fb131f3d5f229aa373e5cbbd076f8bbc45549c344e2948751514827ec0d3d448a363b92bd131d62671f1ce10b663e1dbcc01c1fd983adbcb16
-DIST firefox-84.0_rc2-gd.xpi 493516 BLAKE2B 1037c3f205641bfe885f5e600727448860232a651deba578c0610d3d90ba50130886283df77b0626a027e3ecf7222709a94dbd0501d0cd44fdc2a8fbe5150d74 SHA512 543ec33966725dec1372160d8d3ddaba7ae451e8b21a6bc518ad597650f5733c8d5ceb223060fd69281bf1ae3ba23a2dfb883d9cb754cfe92c8649040108cc32
-DIST firefox-84.0_rc2-gl.xpi 525668 BLAKE2B 74c39adc9f6db31312791d10ac3d940a23cb555a9f3050217314def36cd2a9fb3c6a4a6a006d247dac5e15cfcf5521ec6c83e6cd68efcfd3c632ff674449a68b SHA512 7743f39ed34ae15424ea765efa8856b3dbc58796ff4364092f3f8c7975c720e176119fab05556344204d40305004ddd21ee884c9e65ffe855a3bd62602b04ae0
-DIST firefox-84.0_rc2-gn.xpi 544450 BLAKE2B d5be0167e742bba97b47f40a06c6b1ff486413f3fb805b4bdcfc0ca21c739503f77844a60adb38419863503cb79d76ba15c53ac7175ac38b5e30dc226a5b29b9 SHA512 faa90574a4f47676f9c5b356abf1de6a285c1b7366916a5e624324987c007b3373dffac6c8f0fc4029a88dac9c08183e4b1112b507cd19a054ddde1200334bff
-DIST firefox-84.0_rc2-gu-IN.xpi 542131 BLAKE2B b9cd3c18a81985c0c2ec8368f92e061e5467c008dfa07a0f731e327b802c1e6ae785722d2047a78553d2eb179312ebfdd970304f885996ae4b64fabb575bdaaf SHA512 917bff4e7804602abc0d7bebef64a32fe88505f4e674fb4e933fab809159e3524dbd74245fcf3ee4d219e05482e2a365e94d32435fc60ea1e0a6306132cc319c
-DIST firefox-84.0_rc2-he.xpi 545459 BLAKE2B b8e362c1934fbf3252376ea8e48d166cfd789c579a2e3de84e75dc12063545a40bc53a27015c457d31e07ab8850721f73daa8f4c33eac51b42f54f3ad6966349 SHA512 bb08fff90162da945d638ca91972e4171f70ce8bcdee2bf4da4f090812b2adbddea0fc2e3d723f4a13918238c53a53035203c7a791ebc8332e96960bbc1d389b
-DIST firefox-84.0_rc2-hi-IN.xpi 568117 BLAKE2B 8558f28a8de278d7dc930cbf1aa0dc0c59a07dd42d54df6209309b24da1d9bb5ddbe6b4656e7ea9fe3d5166214a0b76d5c2492fcc4b5b85bda2d826a2c66f240 SHA512 99bac65dc1507ee222de42f510bed1131775a690a03e77f75526c052728bb23b3deef8257ea04f0f41aa69c634efc11f663fec981c5b5d0fb9077d923170bfd3
-DIST firefox-84.0_rc2-hr.xpi 521280 BLAKE2B bbd3a3e7df2d4b94606bf93dc9bb7488c44e5ae2c510106791cbef6276fb175af6e827d49e48eb8c991547a6cc2b81f2aa92c4562417cb5f4272b711e4f2c776 SHA512 942dec01e67dd7fc33386e953177c2a58d545bcf3ba877633a9f235e61b5f90cab93c20de930e9b7fae7629f72f60eef719267e406962f62e907ab4e7ca7e9a9
-DIST firefox-84.0_rc2-hsb.xpi 548608 BLAKE2B 370a625b4e0f62e4512dd04813274eb6305343c8f89a0722983cec4a669d70b09f65a6f24a322dcfd90cf86cebc039a0fabe38b884c83ad8cd12cec3ef29a0dc SHA512 353425b683c0f399b44b2fe82a6683fe2723283a9e6297d2c1f19a483657a94294fe94d809df9215c9e7b31550e08166ae0c78631d6f62c55742b972695da873
-DIST firefox-84.0_rc2-hu.xpi 552400 BLAKE2B d92610afa9a2e8646e58cd648bc79980cb4017784b8ff0820908af3a086504ca6acbb03d7cbb4cd46358b4905ddbb6aa5b86423fe132453091d071948d177088 SHA512 34ed86b42507a227e8539ad05537b36019abb125991af9554938dfbc943cbf34bac596b5255a9064f40ce71ab9da06d3371267a5af082cebc14d31d862bb14d8
-DIST firefox-84.0_rc2-hy-AM.xpi 588505 BLAKE2B 169fb77296381b8fc2bf35b2bc3168607831fc5d280f499128cc5c21e5a94d3576c66f9abc8a33b9692693306cabeccffee08c0443dcb0bfca0a26e032007b89 SHA512 9f561276069db8d22ea0dca1b2d7d01d16be40f0ceb6355d04a0e112e10458ef51d7fe20a4e4f305d81192b2a84a8ce4409a9a397605e58f63d2cd7a21e1dc8f
-DIST firefox-84.0_rc2-ia.xpi 519833 BLAKE2B 37c6b380fc6893e7b69d992702d3ab0ae1d8bf8c3b69b73924152f1920c211efb82ed36f216536e003b350d4ed8338233865104c2dac5f8743f510f51a4aee69 SHA512 5e4f997591c833b6ea7a9a95fbad6b9e81f466d5c63a9354af392925e351a0394cdbe019f1d196441aafb53dbb5e1e3e2b05ff6875b5b0145769137f31c045ea
-DIST firefox-84.0_rc2-id.xpi 508516 BLAKE2B 7f8efb44922e23c12ae76fffd74361608985a7ccb6c27d7bc8d63c9bae44dd29c8fff111c5bd8a5d0080603eaf55d477f473ae051bed8d30872c109cbeb53797 SHA512 107d956cfdec21ac694392677368650288dd12dd8d0380f64eb11b389d6465bd77e79ae21c1e988fb7d34e7bbd63786bd9e170dc66b885211c7e3cd53d8e338d
-DIST firefox-84.0_rc2-is.xpi 478791 BLAKE2B 0724bd45c1238d1618c2fa061054c670302dfa435bb4acc8844c25d1f10b1e55d0c9540a860ba0f6ce9a78df71c00bb1286463c3369f9239714e29b27d544554 SHA512 1b1eed4361ac49f1bff034daa55e61c8b1107d3799921ececad5b50cb83c6a405e3d435c0556836a642517a68aab57016aabfb6d20c7291d4a3d4cd4a5facffe
-DIST firefox-84.0_rc2-it.xpi 448146 BLAKE2B 3091bb6885e6a9f789599cf4ea8ee6a7d6325f6331f854d26aff5f893485c0a31b751c5bf0551e31892e5ee8fa634ab4a4b252eb65539a5296c378ef8e0da7bc SHA512 1417fe583b15d8ee2828203c68bdc678aae42307c25808a2fd42cfd7f3807100ff1ee95ba24296c64c4d56a34a9b5900158ee9dfc7d5f0e377cbedea69386ca2
-DIST firefox-84.0_rc2-ja.xpi 578212 BLAKE2B 234fdabde2b7fbe6111b63b95913d81df3716f7a19b8971af7def7cb5c0f8dcb0b2d9a40f7248934a921be1ba9784f09a7da7b9c76bc20f73e21cdf54fed7251 SHA512 bafe651eb25111285fb7aea9b5a521888f765308e936717a03007869e5a12072264fb62478d57cc35688bf2fb0f27d48ce11c48287dc1bb7481bb400e6734be8
-DIST firefox-84.0_rc2-ka.xpi 579062 BLAKE2B d1529de4eacdadb92a63fc44a48852ef97bef9f906a942ac0f7fc88f5180a94164c7a3c8ec2ec9844d1b4111bad896f5c4107c0265b08062f59eaf2cd3e429bc SHA512 56ced5298207792b70095af56c995a6132ee01b3cdb93e7e16931242ee551f5b2e669ceb364a8c4de0be6308fcca6241a2ce809457dc9b1671089b1eb0879b19
-DIST firefox-84.0_rc2-kab.xpi 538415 BLAKE2B abbef783d3be5aa8ca03ccf39158d76da9acfae4449c7a0bf4d31f70fb1715fdf2267d32145f05ff22c10062e5c0ed581fddb2261bb27524f9a0b313df39ae31 SHA512 c52331ef04493704ecdfed737f219b0ce6c315d693a61d1cf6a96cd42898e61c5f1591b76356aedd7f4d54c913b1ac9e27e5ef91fbc27c71801bb6f89ce834d8
-DIST firefox-84.0_rc2-kk.xpi 591073 BLAKE2B 67c7b0ba48e421959d4c8d78ced6f2a8d46ba7b8b48335f5c2eb18ceaffc2009ce0ebc76b3bd5d9156b12df3bd3052ec58ee9d4b858f86c66f93637ccb12d4ed SHA512 a9fc80442d21e32579f4b9c762ff7b5dc2ee0c6c9b5bda989e47395f4429a799186bedf851eb3c459fa484fd90101e081acca944e4b46492d3d7c0d9364ff0d0
-DIST firefox-84.0_rc2-km.xpi 527421 BLAKE2B 7da031efe0c190825e552174d0353037534685a51e1dbcf59c78794c4022648f48b5dcd8b5a62969b29182021e1fb74ccc115e25ab3dd403205ddfebbfaf2d43 SHA512 1ef08876acfc5ca2b373b4c2ca3170e16dc051b9adb6b39556af1459dafbf11f59ee75e0813593edd9595d415276dfc95313ba4a91d4783e074d6edd9fbf0694
-DIST firefox-84.0_rc2-kn.xpi 506722 BLAKE2B 6e5593a54ac53e5b043d0213efc19e807091c35f2baa496c545a4720cf04f42c8869bfeb8140a2260118d88d05cbe70a476c026477d2a0f49476f7e8102ffb7e SHA512 3af28d4dc181684e31fea418a8f7f73c44502ff94f700205bc3902b4020d17d6e6897c9ba13491dc69a9924fd059c88cbf5fc2c36615683ecb645494d400c0e5
-DIST firefox-84.0_rc2-ko.xpi 564760 BLAKE2B 901ae4704cc773229a57ea5fc5c0a0c57625a72da1b31103794e9d71b74e89ae35d6be6189cb29ac7a3abb0b016cd04308e0ed71103849f57c2a32622ff9c825 SHA512 768bd3f3a98b08ba64ffbff81e5ac8edaad7952782b9950118275ed031b95b496f84f44c2a68f57cb3a98e71aa71d372fe6437328790035651837c6a8276dedc
-DIST firefox-84.0_rc2-lij.xpi 476801 BLAKE2B e3197e4a1dce7c0e0bc7671fa91e4caae87a424997372cd59d759f931af37da447feb532cbaf58a761703fc1b38a2d08e95caf1d9945b90cf0c047627fe80c43 SHA512 620eddfa2a5d4924049619a8c2e423008d0ac0bd237cc46cb1ad6652cfac47fda1550c75eeb6af8e60f912c0953d05621a8b5cf5e91bb659680022d6cb5a3cca
-DIST firefox-84.0_rc2-lt.xpi 547521 BLAKE2B 9c162d0274be61db4ad13c442f6b19b13c10b3db313d35316c9fe5e012334ead7bd0e592526a584f677589ed837ac16efb335f8148a05fb169d54f41bdaf4579 SHA512 1d4475f26914402122a02afe1251f9af6cfc5da73236488499158201b7e0287ad54c35e173aed0e1f96fe65199aaec5826ffca4a70048ccb8733c7b532f78b53
-DIST firefox-84.0_rc2-lv.xpi 470838 BLAKE2B 0723004f21ffbb9e07758b38fba0f93d9b484e31e06d95dec66e53d4cb8e472cbf1196dcc3866ac7370a29b0b44062cfec608b5690fab6cbfaf68a73022b01cd SHA512 d10508bbdd9ae7405e5919274355004aca5c808a03e1732f599c17d8bf0df707c126639d86d3b9f715c118af980a7dbe14dda5108ff2859cb1967b167fdcd37b
-DIST firefox-84.0_rc2-mk.xpi 459831 BLAKE2B 2864907c22e4bc0545a414410f0887ad8dee7776d5c8c8c3d99289cf9ee25477960278ea86bcfc17aaa77f5fcd36457b66461151f7e0df9a924b5a169ecb58a5 SHA512 6debaa3f9da853f4e60b126829a5709ad993c6bc8ca8a1c949af20fff4f7d3866bc3c72c36bb52b61fac9c7a63f006696af0150a7b8a204ad0b2a8cefd496275
-DIST firefox-84.0_rc2-mr.xpi 541986 BLAKE2B 247dc8533e4da3b2f2dc2917acb2972b71a3cde024ce328328292175dea118eb317577890b0ce829e25e16e0c30e0a82a49816767a38894b01146939d6a32eb9 SHA512 89fa00cc2f35be93706f7c2b8ab4dcbacf736f7ccb03b9ec7bd185b33c8794dd7e40f9510a825ddedf52115664830cd59ecc86ef3b2693e2f2023f8adda4a8e7
-DIST firefox-84.0_rc2-ms.xpi 454818 BLAKE2B 81f519f36280ac37f0d59a908a67fee6191f6091a6f59cd381b27fa5597d72a99e861d39d81f3bb4d394b1b129551c1319e29c04b2e63e5394c4a07915b40cc1 SHA512 2ae0d055d0eeda776ec1f1fa6c3d1e5560249c9ee9a072a224f77fe2402097ac7f3b763a3e4cd775536283492705c6bd59415a820f7173bb1300e7cc46f384a0
-DIST firefox-84.0_rc2-my.xpi 526534 BLAKE2B 3be79cf648741b353f91ab0c42ec4b71f3a26b9980699bf214cf2c5fcbe026c34cf72dd70bdbeb3d744260b41d233b907d9ae94f17f674e265c741577129e7bb SHA512 212dcd854747921d6847ba7a2c6bc8e5023be82eaa9828c04db6fa21e688ba23664d39da7e98d80459f486b04147ec20ad2dbdd25b3667116d15b2490cb55f8c
-DIST firefox-84.0_rc2-nb-NO.xpi 516940 BLAKE2B d0e48a82940544de259b6dfeb4282bef74b99c8331529e0bc48858480ee3c587438c2ac4795bfc468418ad10e8224b84ef18816e59e17d69b1078dd21c83a04b SHA512 434b590d37f6e6afe4b06ecf75b0d90fd0027f4c7b3f30b6504e5bd299a70541fb3ddabfd055d63d37e28c205c2f2d23ff18961be7157ebcd83ec4d56841c08e
-DIST firefox-84.0_rc2-ne-NP.xpi 483422 BLAKE2B ab8ff7c5d7843ab09f2fbe38861de1630c638ed209aad6d8fe50f5c38f04d4bea213f4f9dd8574e12ce4811435e9f2fc5eedfff4a4e1aff55ab7fc23b1ce1a46 SHA512 a242b814d5784a706e66b4fe1acc78c1975832c9505cf2cba9ff6cb7c874ccb92d7de5a1529490e653d68b27c11a65563a15eb8fa5b6b760799884e5d0ac23e5
-DIST firefox-84.0_rc2-nl.xpi 524180 BLAKE2B be5f35999738efe1541ee995ae20b69dbc971e88f24f9a3eb45b34bc87ce191299063f24344512ff605525825ab7044f658cbc32918d5849717ec837f25796f4 SHA512 ee25952eb92355a715955b10fd316855c07f3ce98d36a539c4bf8524d87d2b4a11442263dfca98be61037c6033566d72ca59c08ce6ab265d715eb7321b37ebb6
-DIST firefox-84.0_rc2-nn-NO.xpi 517871 BLAKE2B 498ccb8a7eba3a18ae17a2c21aa25e6edad271e52b0aefcd6d10251eaca59e425d097c162858d36f4f69dec6bf427854760c54d6527949284b955b21534da767 SHA512 2ebf336b522b02729451d1935c8ad5cd641ee7b35dbe45212ade6cdacbd521f8a98347fa726142c4bcba7244b038d814939647939d67386d2177f732d08da094
-DIST firefox-84.0_rc2-oc.xpi 540039 BLAKE2B 94976b7c70a8a7c23c4b19845764bf9f46d9bf43fecbfccd297486446582d7180f9b1275f97ed14c0ac7cb3a3e3d8621549efd745db73f20838e0fdb40581760 SHA512 de3d81ff9444aa3fd5e430e627cd0661291e7726f72d6eb4f3dedb798be681d6727ca91570bd8dd476d272e2a7b9f3c0e30c900c53a837ebf3dc5b75e583ee78
-DIST firefox-84.0_rc2-pa-IN.xpi 584968 BLAKE2B e24b11578e837c8782ab79469c99c122fb3afe99f43657d28a6b05d995d5125ca3402da29a340046b98b9e9eeaa5eb2d45b247fbe8919a903a3363d4001acf61 SHA512 2c5a93d2b1c7b1bd62690b584f9fae0b99fe1da8ddc893f7b48bd49c98d7e1e9e32103d5908d1f980b4480b6ea93c51d4f33764dc2b13371377f178887ab043b
-DIST firefox-84.0_rc2-pl.xpi 543364 BLAKE2B bd878fd34c11bc8b36ff8c6436fbd2ba4283efb090bbc1372f31299cc1a0430835b7bc967ad4ce924b21ba95beb8e75a2b8f86bed67807522fc21cde57f98420 SHA512 9de676a9afdeae49334b894150c33ebf91b9cd6db78c35a5824ca207c0a422a30a49719db57ba67c25d8e2cbe270e51426aa03a9d68827aa7deb9941854c4308
-DIST firefox-84.0_rc2-pt-BR.xpi 525590 BLAKE2B 56693b298ae9e6754f8d3ad802882a59bb8d016f12a6a8e7840394be513ae4e1a1a2be677eb8c43a1b1e029bd3fae88806a7426df22c55d5876295b7ee9372b9 SHA512 fbf57b157d4d474522ba4cb31b774bebad799ec75b4afbf68fa4ec11d1b6bb41623598783fa975423df685024a57a7eb70211c5fade64afb598c31b7e7ab2cfa
-DIST firefox-84.0_rc2-pt-PT.xpi 533301 BLAKE2B 15d9eed4fee4a3fba9c83ad0909f313b00502c70c31dc802da03c8b4d356b8e7922c7b919f98ef64c7cae6484b9e7d030d83a5840892cd8d81516339e0836c80 SHA512 b102094758758c7662c459b40f8d181e034770fe6f34142167ddb916ab3f133dcbd45ae9538b604555f3ed5ccb1c1f2616ee64d50253c5bf833d15eae0dc7f83
-DIST firefox-84.0_rc2-rm.xpi 524840 BLAKE2B 93f6b85342a3d001632c1b55c743ef2d20b865ce5014418710d6c5de57e451962d1ce10a1180ecd451e15d91e14834c363f4d5905fb4d660361b4f071ee93f5c SHA512 c2d31fad67a619abeac29209e8180ede92957c99725f7f491a63b80469583b9b035c243a0ca66ee40502ec8836c163e6193b8c1aeaa96f9770ea1e3c3f91c5d9
-DIST firefox-84.0_rc2-ro.xpi 532974 BLAKE2B fb955c802812ede28c21ef3e4b443cfa44b9605b657536341b47eb78112398aa1663636ba2ee36663fc46f1bee62e4c2132d0edbbe14acac4625c1b8470db9d0 SHA512 3cf8f3ae2e8d8f9f43a49fe96a9964c777ccc07f3611b9ca89f8e76c0d73c54ff343a2bf246cec60761ffb5d2c0ea1c0a0ee0f58aa6cca52a8f1bab596655e36
-DIST firefox-84.0_rc2-ru.xpi 611900 BLAKE2B 53c020614b0fab742c516eebcd460226fb21194525704f48ebfac0f25a654018eac4496cdbc55423698793221b9aeef4828f5c8ff3d37ccb228d7d467f50223a SHA512 7d19e6098368efaa9d8ca1c20dc49c9c72cd290018e3404c2b2d8e3549b7a7bddbdb3fcd295f36e9c8d4d4728eb23388d6ba1e41198979e4f80261dfde4c5f7b
-DIST firefox-84.0_rc2-si.xpi 492927 BLAKE2B 39491dff0af8598e80607498ab8c44bfc380aeab3e528a2eaf133c7615d146da00e80cbed68f1596a98d32340f0cb665faea3aa3a1bc9a353814491a28dff6e2 SHA512 753dce591d24e01e5af2cc11ee8079e13e28245ea4b9c778c4b5d9d52e30f1ff071157b1cf6b06df28881f67f7074bb379d62dbdccd8867113c9ea338e3b38cf
-DIST firefox-84.0_rc2-sk.xpi 538496 BLAKE2B 4466298c0ec6cd8d02aa9dcb0566e0a1f9c94cf3364387bb8139d6e3c526a80e67dc85d9d607e50d2fee03d05946289b97d37b99a3c5648aaad6e064bf1fac35 SHA512 975d0581d9128eb1946fc9c8ba63e1908a9d3f082160e1c9094e7b4eeddbb58ebd4ad18d321817960ffd2afaddc12d49e5ea6e87489eed4542fbfafbfe401c23
-DIST firefox-84.0_rc2-sl.xpi 521132 BLAKE2B 89435b3e5162e9b30ac2c665da3f28a11bfec1b3b971a8ab888dd7a425d809a7585ac98a9dd39435f413d5bf5b31e1bae112a03807328410c3626e42b7c19b04 SHA512 9c0753928253308aa5aef1a9f1141823be100c407aef8272bd6a0ff52a673e7aca314f2593093cea511f932b0f828f3f738e5cee9e7c475c76efd762511d5013
-DIST firefox-84.0_rc2-son.xpi 425706 BLAKE2B 612eba3a59a8aef0802f83235c4ff7193a7d848de93cc3c3274bc46a48806053703cfe282a033194eb6e2689fd1839201f61240dfded06bd54f247b3a0b39d5d SHA512 c9d5392360adb6d807b930a310e9f5f74d5a42d776d0036c0f97775329210a9c9dbedcf9eae311ca1d7e8943969e177eb56b097c3738ed79f2181ee9c67dd9c4
-DIST firefox-84.0_rc2-sq.xpi 542777 BLAKE2B 6a7fe46253d7d51dfcb0d24c977e2b7d393f272eb60b6ea331d3e73e3b5d354d2e0856382a93b14401b1a94d9d6993f2f56169f7fb98781a45a441c38b761037 SHA512 eb690797b435a4cf1695f284c7670df464e06805946fcd3c46c78333bbc77f1f4ce43d98cc4641cd55bfe9a338e7a3f897500134b3189f7bbdb740e81066523f
-DIST firefox-84.0_rc2-sr.xpi 563739 BLAKE2B 1a9b5d9c42ad064b984d3410a6575cc070929b4d0953e985ce81bcb3090fe71ac6b277e1ed6372bd21be5347bb8e3b9788231940ec356fe461fde36bd0b358fe SHA512 7738ac3850bf2deee37706d26b1b1465116aa4f0718f0e181f9ff04809973d2081b2da7a3345c2cafb573a036db8f578e9f8fdc4a9bf634001d157304e9222ca
-DIST firefox-84.0_rc2-sv-SE.xpi 527548 BLAKE2B d7f7cb47dadd89fc67f590522175930502d32bde3f92edb8ca375c691b5a2ef87f9da6fb1af04160fc5c3bea2235843ff52cac4b7b5203eb88172f090e573129 SHA512 5329549635fd5e0c99000222cfaf825c0fef3a2b254336a77a6bc2e2fe83db7fa061da2e1d74ecc76de9366c7ec75f11510e4726ad9cfab1d9f839429138fa76
-DIST firefox-84.0_rc2-ta.xpi 521655 BLAKE2B 801b313100539936969a74f031c915fdae8198a38758a44f8ff16b340bdedcf36fe25b8e8a63de5c1e071acdd6c1896ee48a77d45b40d7c01557a69a5e5f8be4 SHA512 b67ef0540b2f2ca5fcc4c2120da29823d8b8a5af0dde9f28478ae7eed33836d9a08570786c41221d3f6253387de00912c4185cc611a91a9369c2f2122d614f1b
-DIST firefox-84.0_rc2-te.xpi 558090 BLAKE2B 57c0f5ad039d14115eae693f1e6c2bdcacc9ccec08cef7bc4d2dd87f3cf445807dc23e9bf61d6034a1aac7140fee9ec386fea3343cfde4dd3360f032412aa9f1 SHA512 8936046547cb24c3ae804f3ee93df93001d4bbbe31f2cabbe003fb79fd6a67bf2c30171c6bd8839ea3b480ff4b572fe21a7069b3ad4407041f380f70da08e271
-DIST firefox-84.0_rc2-th.xpi 592811 BLAKE2B 3d9554114eac7eda4bcad197bbf5d32109847c77ccbb88275b8367b0eff8badb61ea608efc7de670dfd4df413bb472fd82ad596c3b8a9dfc10ece2169e7ce3d7 SHA512 f3c3bea3f08781ae1ee779994d7c6ac96e70da3f1b580737520edc103673c4b70e6e3089ba4f91424d3b3ff4fc51c8a206666cd0f559c4e8abd1c3ca0c938e19
-DIST firefox-84.0_rc2-tl.xpi 519350 BLAKE2B 9e2b84d5a18b3cb6b8068967d0cf09dd743650bcc97404a80d442316b1aea4414f41a82e67d45764293da15ca645f9434aaf10fb74f42f7be59bd107f45ee2a2 SHA512 30b1a44d64503da7a189ac76481762ddaf4e7062d81a056d283b9c4d3c3d0656084e2b82e8d9e6ce8214036edc67dcbf08db5b806b13e2cc51d792298c4811df
-DIST firefox-84.0_rc2-tr.xpi 537927 BLAKE2B bb52a4ea6b92b42481b7d91bac34a16f6aeac946a44bce52222ba3e5a40fd17f9dc64dffc3dbe959a32b2e9c12ccad7004654e7c28a9fc114b3a6a32e287234f SHA512 32cd31396108437aa01535f7fe87c624e57ce9bdfdd8ee1d2aa66853c01a120ee70d3e6442ec98db67fab71719de5cec33645f15a067a6753d4e545e266c7402
-DIST firefox-84.0_rc2-trs.xpi 500696 BLAKE2B 749a78732edd365445ae57fc64bd30c01cfbfaffa383773274ecf44cc4b11d7277169b5d180e9ee9d1cd0be10478fbcf56c6a8f04f87450571a47026047adeb7 SHA512 e04b3318788ac04ea3dc64784b6aad303c4a6d6ca9b181ad4c341d022efd2695ae19286f539a828af280c67f5f5fcc32e18f0340781dd949ad7c0abc9af00c48
-DIST firefox-84.0_rc2-uk.xpi 606079 BLAKE2B 1afa9118e7cfd1b96aacf5ea582a9c6ee4fcb053087b3d935bb5310b418a81867224bbb22ad18ccba9d08227d4d44c26110da1848dd2b7e47fd15b8b79326012 SHA512 ccfe395b1296ba9a914c9ebb3dd014dd5c891e599cee7809450e22d96e6a6221cbf9cbc529dc49d18bc7b81ec5fd1ea6a9119cbba88414b931cc9d16af5e44f9
-DIST firefox-84.0_rc2-ur.xpi 558462 BLAKE2B 401b9b261f960987ed937109326861553cd5e994eaa2f9232545259b856d3495f9ccf3e503bd8893432e2f149aeb843d667e3da5bc3287f70792d46bb8fcecb6 SHA512 47c0f45d6ac53011272c5e3fe0e560bb4e0d89868010c1281acd7a0759d9dc2991d2a10a228b872c8e001fa0ade7ff013508cabb4592c0779c52822bab2f4d2b
-DIST firefox-84.0_rc2-uz.xpi 478526 BLAKE2B ccb3a55b07d0326468e41d4b01ab5e983dee2763dfd84090033a2ba7eca478103905d86b0db68928c0d4b7f6a1b766a18f39be50854d604ed835e10140f44465 SHA512 29c055c97bca182473ef561438b2de83286e8253ed66eba0c8635e90ab75f12c3fe508dccda827c8121c23688c69e975efe04061b3c2dd8e913418d75ac36f51
-DIST firefox-84.0_rc2-vi.xpi 561447 BLAKE2B b4d42fa556b6b3643de0bff443b0778e8a91a02e709aa99d7e507b30b3f09410a28239eb95488066af7a524a3c1e129091afb84d1d38d36c6faa583be136c277 SHA512 c2f92d1aa0a9249e8b5a6ff6b12e46e5b9fb87ee33d733807310d0b03d03f7ba7439bccc27f445a0b3922e4a2477c0d22109588f24769126ce71a0cc04c4f3a6
-DIST firefox-84.0_rc2-xh.xpi 427849 BLAKE2B b4bf4bdaea6efca72aa902ec4032fe6990ffc32eeba773d621b8aaf650026f7e29f033006350d0ae38dd214f6c4ee759283e008b14d84033e2b9565ec0b2fd6c SHA512 b23714474dd1c10645de3aa3b1bd720c351e51e9e83de9415652d3de0748114ae6340a2585eb220b6b00438310f2b7f35cc5ac3a9ddca800031df046fb6fcf1c
-DIST firefox-84.0_rc2-zh-CN.xpi 562146 BLAKE2B 93fd6fc15bb902c6256384402fb8e7293282e21d3ee1ee17f7d76d332b164737babd92ef65795425f86706bf5c1d7431cb5f37ce2622394d58c2a2797e66da52 SHA512 a8a52bc1f67b65577eff153fc1da6dca9b5620bad829f797d0bfdabe69de727f3efd07001e9398b8e8fc0370b017f851209591751f518ae5eddb616948cb73d1
-DIST firefox-84.0_rc2-zh-TW.xpi 562084 BLAKE2B 2f591031e66d12c35caaf84f81745bc6dcecf89e24115a41cd6fd33844850bf254d74d1b8372e3653b5e38cbd0620fade796dda7821f1782af01f88129dee1f5 SHA512 7776cbe144bf54a82ef56c8cad81ffb2b6596ffd0a32bb9a55eec0c0fff3c7ac412d9375c8dc31d0505a298eeb723b16324e108848e0c5270c9fa608ebea27cd
-DIST firefox-84.0_rc2.source.tar.xz 364652156 BLAKE2B f2d3ce699f78d7534975f422c3147bfdc69cba6af071844341146da29e943862d8089f86221ccc712c40b0b0b70e3ddc6bc0a901451279faa11dbaa4a10b8ffc SHA512 470ee3fa7f2e7489925942997bb66a3161537abe43182dd898d66bf9a2ff2c7efd85db93f7494e238ab5760fcfea12c69a55657c9667d8e052604f9624b70160
+DIST firefox-84.0-ach.xpi 461782 BLAKE2B 1bac57ffef8d01b3ed496a0d50e145be3c3a9ca86d245e2d22b39146d5de338a92c83c4857e0d67566f25a1ec67df4cd18b35dc4d56586edddcba56ac7c0bf32 SHA512 d6cb2b0d5e92052f5be6ecac1c997f6baeccc2b6f3d99172813d40eead384b12d1b2db0d11457c06f2a6b31e2ba2d1bf3b1369227b0270a82100a429fc0600a0
+DIST firefox-84.0-af.xpi 429057 BLAKE2B 1012416bdba36ebc227785e837b7108d720f4ec179c6b386e232809454d5f7880b1618cb23cf92473a3a7a5f327f062a825272c5cdf677ea869496a63b76c8d6 SHA512 d8988a632d64f7a87dc16b77e9ce122ece015c9c03e565852a30fd59af5efd2d773f981fee89787ec4aa008c01aa8859fa9d93a9a294090863e11725780fdb02
+DIST firefox-84.0-an.xpi 509100 BLAKE2B db0884e1a35c467d47f29f4ad9f3492d7d6116981a8e5ac6bfda536f7c19c91ab02038c47e64e9aef0fe75252b90d00bdd4a5a33a1c873d2eb0b17724ced259b SHA512 0f6dcabfc98b3a141c72e7fbdd9bbd272225161966ed6732b8f2cb92e425d8577857d6df775aa7358a3278040efae7b0d5bde6dfd446f66719267f4c62f8eff2
+DIST firefox-84.0-ar.xpi 560411 BLAKE2B 48dbfa8b0848918c07efd85d7c770ab1af14282999af95aa038890f9b4a9c4c179f1fcc6510ccf8fc08c74dac413274d8961bf6afe87069355721f75ef31558d SHA512 5dc06fe1cca3398c609b17db28f678eba0b6af5145a90cf64f476a4df045bacf51b802639c876968fb93531945c0f5c0e5fc06cc248385f26d3f9608405155f3
+DIST firefox-84.0-ast.xpi 457474 BLAKE2B 9b1afd4add9c46b6212799b69e3ea5668ed1db4101621a77c0cbbd789e32122c3f82971d774dedd7ab46d0d3855a8ea4de15612f0ba7f392bd85c5fcb6fb29ca SHA512 3399145156d6a3f0825dc990185e15f6df8967a46487673b65f7841a589afb2bbd6da5185e317ef46f906bdee3f4ab5c82bd2b573e410d26c62877d5467dc917
+DIST firefox-84.0-az.xpi 498631 BLAKE2B dfc41dd5ae0c6424a929bcb9375a4ef27ced0e2de38e3a1187e653f13138240fad651aa29b11578ea32436afbdd3dc8056c060fd2a7a5176c789c67dffbd9882 SHA512 420d6305ac6c09dffe14f98abbe809a5093491a22b6ce32b45f99d748a7ed42be39cd40249d1cc22231e3002d3b5eb40cba5c90436281361aaca8a374b0461b2
+DIST firefox-84.0-be.xpi 606511 BLAKE2B b2ac86f375fed9cbb72b91121676e0cbcb615ee3a81fdb286595c155301bb4dc279e04aa86da9eec35afcf216d423bac166ca810849797be9f7062e9426d9edb SHA512 3d2348105494fbd12586e473c107af7451695c77fe67ffc17a7da985018fbf83835592c0e8e9cb0622fd346cd5114934bb080fe8758fddc9cc8400adeddbefe9
+DIST firefox-84.0-bg.xpi 556439 BLAKE2B 0728aad322800ff889053ae901e4216b8888ef148b0972f8fa4949db94468afb343469d3e3663f67379620384365d19c72ec01ea84b6f69e34f6daeb85ddd720 SHA512 742bc780b64f3d572b481297bac97eae3d0432dc8ba0e8b3943ab4d0dce6927d374aead24893362300e415243ac4463e349b79ed46cdb982b8ba6342589f8e26
+DIST firefox-84.0-bn.xpi 573370 BLAKE2B d9ebd4f6a8cc7f90b0d637b026d3e1115dfc754e41c6d5ea99ad5c4d054aa6825b4187c43f870b8d05ebc075922286d7e040f9ab5e78b184c4864765ef55aee4 SHA512 8771037300c3a2436e1fdfedd63c9477ce9d00059d30d0a8eee2bcd76f2c66baa412cb9eb49af2a8b4704b3ca2662d3d08003d3b738a82d3296ba26ff69fe92e
+DIST firefox-84.0-br.xpi 514065 BLAKE2B 216d7d1c3b1f6f7089f5feb8c04f10fb82faa449be6e9c338a108495b9639bf89d27198b5236e79121907d498f50120e4e535fb135d1dc6bc1cd5afcb006a609 SHA512 bd4374c8a31d1af2ec15271f99d98351fca4b3421cdc94cc544f558344a47642048629bf17513a9030bcf0f79916b4c40fa105fa9d0abb177ffb2512a73a9a8e
+DIST firefox-84.0-bs.xpi 465256 BLAKE2B 58013792b1b27f9c013269bf41ba76622e7881049c1ad1a641aa228aa1d0547a821a2acedbe1c5c588713ba865cbd6d00cd5f26071f1f0b883caf9000efa891b SHA512 6755560527ba8acdd3f52f3c25088c746a0569050b7fccfdfe65a6adcdcb8f5b5675f99d4ac4ee2993f17cd4fce48514782187dbd9b1a97540b30dd91e71afff
+DIST firefox-84.0-ca-valencia.xpi 518013 BLAKE2B b94d887158d7471c0e5239387e0345c43392c0e09d822b78f7a661ca9dfbb097b980ddc0fb720ff95354cba338e966d7d3942bcec8234837970fe3e3b023fef5 SHA512 67664298356455d65b8eb8cc20ff3c11814317b10d7cd87f044394050ea56ad2f5981a3fa80cce7ce78306d415a8afd9d5f4bfe7e7ade22d0f1aa571cbf2d04d
+DIST firefox-84.0-ca.xpi 516050 BLAKE2B 7b9459300201fa9494836f5a8290e0face3dbc11a7ebcebf9f947877777807eabf451a95943034f9cca9c8538c4184b060ebf401ec8abfff80f1af59601e73bd SHA512 d1ff68fb2cb9fe720fa03acc196c6377b5aca28ee9fbc1adbe5d5af17894296482d03e2da67cc9b021cc506fb1206a51f5d26221deab8f71485ac3a2c5e890b0
+DIST firefox-84.0-cak.xpi 549476 BLAKE2B 925b9c0f0266027be178a1fd552f3257332db7fbccaa14f6b70f85b073be0634c2cd5470a7a078f364dab7f1663807a9fd37fc065f5df6fc172edf0915402c27 SHA512 450dcff7e3508a3aeb43346e33778cd25e790469a8ebce157a43cf0fa2077ff23f38b770076bb6e2dbf65de5920804f965e4b4849c186941a5d336690960a2ce
+DIST firefox-84.0-cs.xpi 540229 BLAKE2B 48a2d0e9ed402dbef636855ec60ceb595e8c0596f9080802871773a239b9d452af9eb20e7d64358f22fae145ddfdeeaf1de630529f888688d3f6c6a0ccdf920b SHA512 c500e273c84592d429a61b77de58e29fb41fb5086b5ff8c4aa78e7a28116153b9095a5843151a47e07e9caf07f71c5c769ef486eff82e242761d27d8feb5eb75
+DIST firefox-84.0-cy.xpi 528799 BLAKE2B f7882ad21d11030d071cbcf845a5aab45ace1c834d3d7a197ecaec4e36d2711a4da4cbb4aaf9727b5a879013b20b5722c6c910f0055239e99aab44ca30c345f1 SHA512 cbb7e024ba271a3415b03e3de4461a25e9e5e3c79eee8e5acd76c6d894760f7a7e2cffb6df5f000e86f8b54822ddb6106eb9abfe01b61dd253d2ef7b94dd4df3
+DIST firefox-84.0-da.xpi 520967 BLAKE2B 63cb51683c2e6267cc87d20eaf64c354afd944e12236ac1a457a31988e8d794473aac4ca941b53e5661dbcaf21ba07b207e588cc71267505a827586705c7fa27 SHA512 21010a042d1dfdf8cc7d5bdc5926e8e2e8ed9494626df6c199789db5cb563d327470d23ef5830dd26c1e87e0f9bbb3267e5c98585dfd92a12554e7d27df3ab68
+DIST firefox-84.0-de.xpi 540874 BLAKE2B e1dd09c35f4c604da64f6a9f1a2771c1ffe787d7e18b30564febc21a671ecf1a924ad2c70f3e14fcbdc5d296efa664d26b8f9bdf47933163b3686bad98981d2b SHA512 00c0db131cd30f377ce67a03b2d09e974f73b2e586d5e3af000f37bd5c73526c0cb2a6203d7c592050d8c2922697381a20f799d217d199bc4df9a2f7d4895fb1
+DIST firefox-84.0-dsb.xpi 552201 BLAKE2B 0374a59dd0c74e3257aafd8b8068fd8d34ee9a9832df7da48077ffdaea9ce497031b9c5f2d6d2604d06020091f8ee1553d4cfcf0ca38bf3d7b684be9c3d4277f SHA512 f432465229ec3831b08b2607f45d13eac865fda2e607b1de5321084fc037e25e801742e2082fa1c6a2163ca8905a7443de1d43d61f9fa9e56558667f33c913be
+DIST firefox-84.0-el.xpi 623763 BLAKE2B 73886af39cca03a62f37dd999831f43cd6db5b8f68bc3b26c04e70bf02ae66a882b55e4b667870cad6614f9818f95bdf18370b5d336f95947e1a579f8c8115c5 SHA512 42a6593bcc27e02cffa37c19b6503b27835544553472bc6dd155bb80da281281684baafafd21b4c544ec6d68cba145bc226e3be2f75932e488065f6a26932493
+DIST firefox-84.0-en-CA.xpi 495288 BLAKE2B 4318e0f830f3ad5917554a6af1f2f807cc1679bc4908b255c1f714255f52f12a73b1d13e18d219eb171161bba5e7ac55b835f7463cc609d87ae83e7db62542d7 SHA512 99638fb05a89b857e83fdd00590287614460868e3b00f52c6d4f3f1d3ebec6a7a681ddc44c51dae89dac1f3514d50c4b38136c03cde2beec4ed5181e0782a202
+DIST firefox-84.0-en-GB.xpi 498699 BLAKE2B c12ea859249888c933469c2d95d15c487b34ce5b5f8c85d4aab0eb399bc94aae793a37e1df59d5adf916cbbc6ce218c96f1b23062c2fe1059d95213c94ce0d1b SHA512 4866d4c787784fa568c82045f18a46b4db1b1eaac9c618b4f0fbb25251d69d19b3dfb5e2fd104b12d364b14f154e6446531585d6b0fa3c440827911870fff81e
+DIST firefox-84.0-eo.xpi 523253 BLAKE2B 51fd21645bcf758edbba26e7aba4669ef3fccd8a3e706a853789a1e45896232b116b7a93bcb3f9e988efc47b7def90de3f7d92352ab4cad1a8917d5698ed7c46 SHA512 a1177a53cabdb4d351f47a878ae53c84434371eeea68d95313985b2ace12d9bee84c50f1fc57bc458c7d792e56a4b2a921041f356ef8cf01506bbce14afcad1a
+DIST firefox-84.0-es-AR.xpi 533681 BLAKE2B ed55979ab94d23fd755ffb1532e4dced7d96c8d2aee8dc344705dd84be99128a27ae6e1bbeb3100016aee62e5acc29eedfb4d9ebace7c9c271e05190dfb0520b SHA512 644ceafa73ce6c9962056c9c5cb45dca809d9feb7cf2a003a780fa53aeb52409ef5c2a2c2c25372252544c77e74aaa8f665ec53cc4f0b7229c38659af11603df
+DIST firefox-84.0-es-CL.xpi 533171 BLAKE2B b0acc069c6826201c52a99353e0ad4974739ebbf35cd899cb9446263cd67c65c11d474ac161504a5330170d28c52f88e781dd367c39d16eaeef076365651eec1 SHA512 42c9bbd92eb6c2511bb73cf25b9e44d14d51aa4e54dee84cd1621a98e9fb2d8fc50ce84e8e6a25cec724b98d97df5cab9551e8585130d5891b23f1051795e9f3
+DIST firefox-84.0-es-ES.xpi 523073 BLAKE2B 64be1530e4bc75874d2aac134c639ddbe342252681ea67e85761b272da38e7500958b7eb451c113493d32ac4e10b33d2f25ba77f8dd1c998e8c96a54a6f6b21d SHA512 20a90c0a12a80a67bc4cecd9910381735c060276f935f3fbce7bf48580f620c196d695057c79b6b87933c704898669d988dd937db80e3c7709a8965a18dd9050
+DIST firefox-84.0-es-MX.xpi 531350 BLAKE2B 80569f82c683b7266901611900b154a575ffe881ed4a2a1971073353ffed91b94e07af9f7074cc2c4ed19dc1a64fbdcaa24f8667aba1abcdfad66d26cc7891a3 SHA512 0cc1330f1a483704b11566c3962b62d95cd958770b5c715ea3720cd6a6dc7db2fbadef4dc300bcd8644be96494e285d13a2603f3c6a3715746297fc85bf0979d
+DIST firefox-84.0-et.xpi 486946 BLAKE2B 8c5f333fce164f9f3ef5030bccf66ccd1a5ac9064c8c8d4cd6df7054017c3b85938c2e7b735c6422fe6ee9c40678b9ec0a146ece9f9446cc754f374ed082ca62 SHA512 f99db2fa9dd3228057d63f7f69db495f9b72b51437e5cf8a6b4d83e1f14ebce07b28e6397c18287c854870393fb3e618ec84d40a5b99050c778525f66c4ca78d
+DIST firefox-84.0-eu.xpi 515146 BLAKE2B 1ae5559e38f695bf6b9252d8b44aa9be6029cd2735152384ee6a8957c3928b6fe892cc729812ea2b7cbf019259a3a5453659256dfccce07149fc4a763ef6b071 SHA512 7f9b0b6d6da854b35c968155dfe85b60cb80627fbafa9d63c7176227d477ecdbe1022bfc777e2384cd663034942a34c6df07512e9a9cf729b7f454a434ccab0b
+DIST firefox-84.0-fa.xpi 539667 BLAKE2B 7cdcf793c157c9bdcf3225da266b15afddbb557f8e0488c77b8e33c6f6de7140d7397dd4ff9b82a974f4af036b80af4068a075df6e7d81679707c5bf2fc17367 SHA512 2cefe4dc1c9111619bca82170b013770d8a90a1a0c3ebac2e7f508ae00b672caa8052ee8ec18c387b5e63bb7c277875e53a5942e001c56527ea1110589f1891b
+DIST firefox-84.0-ff.xpi 483203 BLAKE2B e832ebca6fa0712de669aa59bb5bc1439bb022f0a577b0f337105d29586f9c259590fc789a01f3bc423a967f404de6cc5ee16194cd6a006a3b977cb25ada6ecb SHA512 beecf1bd971370d44053ce3e4eda1662c0850ccf8efbc970a6554ca5ba6da159501731c4f3f3d2cd635c5e32913094ba877995ed4c794c00395cf0906c13203b
+DIST firefox-84.0-fi.xpi 520036 BLAKE2B d0fdc5e0173e69d5028ce2956c007dc9711519e56fda21d226026f89af7685e09cf28aedcbf27b1360eb1757235a9010c7b5e2e50b859ecb82995b170bd22c6b SHA512 89259469879a318da43646f9ded2ac4e37715017261db67fb32567e2819f8c2c1f1f182639e92b586dd525a1bc850ae7f428b7dd52a7ea6e74d76420e5d915b4
+DIST firefox-84.0-fr.xpi 544360 BLAKE2B e83126d3859fb10f5be862f41745719d0eff79bef58086759c9079b658f5f68173301855e3bc21e2a438869e8040b0fe4b0792eb54b19d5611054105e224e5e6 SHA512 5f860a0614a1565857fcc2af6a2e26d47a0992d28929f737ab74f787bb8b0dd1b1258d784671d0dd58762eb034d6d444c9eee1dec06b3530baf1206e16c50594
+DIST firefox-84.0-fy-NL.xpi 530310 BLAKE2B b665874394be0632d92f98c316d14ced7f2e4867ca11af340921ff94abd5acb1483280f111138099be3781d334c859da61ad5c7e0895508b2ebca2fb62f0197e SHA512 02a47d10417325778083e756c043892ae6bbfc705cd940454aa39f9c5430dda1575e8b45da1c865f336cff522cca21bb9b95622a3bbb396f35e19d1c176e7709
+DIST firefox-84.0-ga-IE.xpi 468080 BLAKE2B 7484030ceb091abc442ef77e228244ebce8f931295878c26338c25258f5e78bf11fb5a52e7482bfffd052b2aa6cf94fdfec30bf375bcc444ab7d4dcdd31cd0dd SHA512 39f1233377a7706807d54c23ca27852ffab56ab47395580b9dc8068b2a3371b43e842482e29833eb651197f048370247d593f3e601cce56aab5c9e1122255eaf
+DIST firefox-84.0-gd.xpi 493511 BLAKE2B 1440b22cb30cbe2f6431891c94fa88b0095bb84152d399aae7a1446e16c7fc9cf49527a6f03f99ec63f123e9807c2ba69dc6b767d157b18ee8dfc31956500318 SHA512 0ff382e3a522be671ac3b182307a42d090649c028438992c22d30e88725e0530f5a3cae225617797ab5c2f9abf298d239953a42f2978b4a405b833a99a495bbe
+DIST firefox-84.0-gl.xpi 525669 BLAKE2B 7a67462139634bf2b755660b0fa65f9a5cc77ef1042cfc478ff80e4dd214ad8170836e2c5570270c95560cee4c27fc8bfc9e4872cd7a7870f3dd17716274001b SHA512 30258168760ee43b11d6746015cfa466f460f2fac1d9f29b10727e2713fdb2d8e604e579d39fbb7a5bc4f414892ea34974b9d23c60ee6c9dc8acfc1cc67fabcc
+DIST firefox-84.0-gn.xpi 544459 BLAKE2B 9a106f01aa7e88220a46addffe5ed6d544f56c1af6ee5aa135db75c9ed9fd1e6c7468e31def7cdd5aa3faf30b757dd899220daa3db80b55d32c6ee7f374f5414 SHA512 1db4888d67623712d880272e44f8cb124168df375d94d57767f4608a92567098a4492847276e9936467095d59ad0020bafe8930e6fe5347963282fe5219125cd
+DIST firefox-84.0-gu-IN.xpi 542128 BLAKE2B dd6a6127f5033bc50ac99b664ef5d65201383228b3f21bb706b1f0d6cfab6a0bccfacdc535c06c6758e71c188e23ab026f43b1877cfad59ad2f928693c31ec2e SHA512 f647191f30a84bfa4e27becdd16b6ba5106efae162077c660c06e967161fd1ef9adfbb00d0dbdec58f3a6dc9b240bc3b69ddab493105521757e301aa062889b2
+DIST firefox-84.0-he.xpi 545452 BLAKE2B 492e6bbaed9ef08591fcfc9d0bbcdb191f8ca43bb78e7da34d4d666c559d864787a22635904659cffb15722b17eef8ce686532c099ed952155aadc25e79f46e7 SHA512 7742d3fddc10bf29a8cfbec47845ae2144940b78cc668e15ed14121f36c5900b4e1505f6c3aba4c6668ae46e14503feaa5edd6ba3d9380909f714130a7f46cff
+DIST firefox-84.0-hi-IN.xpi 568100 BLAKE2B a94274b16b01125cc04e5080def6c798307ae0f345a868f98c8083ce739f300bbf55736175b98aaef000d87ac8aa4615d28110d34e003c5735867631960b86f9 SHA512 8776607acb3d06f4ca5b351f25d7f29ed4b2deded1fff6b94f5ac9640634a31401a50466f677658d678161079e14a9747e35406fb81b503a3a8b214cdb245c85
+DIST firefox-84.0-hr.xpi 521268 BLAKE2B 64b34d05c2bb3d58ca3207d3444b26b4eeea2cb9e92eb4c580839b49c88107323e7b30a42c730615bbb2257db43d880b13401f0e5dc6e6d110e8ddde89b0953f SHA512 626543915ac5708ec9ab9da3b7f1ebae07e89ffb5fd5250451e778edd5d5cfbf0336a6a3f410f04317f2e92f2394282eea6645cc3d2ed124ff6149dfcaae5416
+DIST firefox-84.0-hsb.xpi 548611 BLAKE2B 748f6778fe77c3a2e458d1a3343bb744dbe4fbabc5bfefcbe1974a9659706278c8c5b7083557e7cb555723813b8ad8a452de0bc3a33212964eaedfce05cf71d2 SHA512 889669a590651c28d4b8ba09046860d71d786d8fbd72a31ff26a92d5aeb476d6210c4389fd1a70246bfd2e7b4e370e874c5f37ae531b1984d9c4b69f94a15162
+DIST firefox-84.0-hu.xpi 552385 BLAKE2B 5bdb5c30768728752c57880e486277bc28bd00a3483eb254eb782825f4c8197becadb045240cb9750e78eca5e042d32b8e971776123552a078a56dacd9f0d069 SHA512 9a05ab0fa6683fec9ebc9b346212956430ae13769cd63c696978fff027b07215a87fa9378f399e83ecf51c1f71f415939190e026eb21242e3fced1a3d33ba607
+DIST firefox-84.0-hy-AM.xpi 588502 BLAKE2B f5f8dcf9a84c8adc32c8208f5a7b225ac51cc8e2a930a625a474f060cf7ca8627cabb43f824944af3c4ff76ab2375516e74067a3d3bc919c8835fa6a928a2289 SHA512 37803fa34fc7eb9317302bd584062a018528dee0b58ac033495e49dece0e93be4f228b7a239ece41743fca33fd1e6f256354dfa4d76f7953b8a0b7625208163d
+DIST firefox-84.0-ia.xpi 519830 BLAKE2B 97f1f4d0488bc9eb64c08ca97b2057952e67a791d3bd2b293b61ba7c57979e4badf755976a94da066ff4cb17820f5c38d03ce440aa6feb9331f8cf38cf74b75a SHA512 9b2c31bfc1f9a6f378fabe39dc1120c12a26fc9d3d3eee11dc567d019442d3d4bca906f564b1e7e8d28399c49666ac80716d4e0d27a2606fcba75858ff6ed7f3
+DIST firefox-84.0-id.xpi 508528 BLAKE2B 0ba19da271d72d0c2b5768fd2720008d5be811290f7eae6a1cae5ae92636ac997345260ca0e0124b906d45e4449d1695f3d6c8e6f82d29480d6db829dc8e6bba SHA512 ebc7374c674a7b44731c8aacece81eea0f2318d39b58457704ec06f56e69bfb4dfc67796908319773ed0232afb186423e4bbb17f61dbc1a26358ce0391dbf331
+DIST firefox-84.0-is.xpi 478787 BLAKE2B e84e220cc64e4d3b089ba4ce6019f873de41fa84ced2738d3f99b67542b61a9af24b697185f3227f259abbbd7d565acb8c647ff00c79beac9ab5dd1ac9ad86b2 SHA512 38067ed0e3e04dafcfeeb05a224ccf581666725bac1e897bbf60c4637b43179ad6a9e3db70f18e32efbcb72986df3c65bd3b9f596227617e918704af2c96a8f4
+DIST firefox-84.0-it.xpi 448151 BLAKE2B 761bbd01089f02c3bc8840997b57db4906fc473e25bd8b3ace8f5822958a6d4330a4fe421d6b4dc5a1eddc8ba158fa85f4f3bc6d3bb3e63442ddeffafdde1066 SHA512 c23341882529638daaceb908bfcdf83e05293801603c5386a08fe397e49c0b8c4c5d58dd57b0d2141dfbde3906fb50646c2e38c6d42ae9935d1fa08083f87365
+DIST firefox-84.0-ja.xpi 578212 BLAKE2B e899e06f7a0699a8d1243806172a285fe9499133e92af3adea70d2edce298d3c0ec396825022df88fff33055d22e6572cea71f81664370d000dce55c56879050 SHA512 1bdcb173deebeb9cf26c526940c2550e4a26465fcee6c1086c4c05c5962a5898287300e45aedd355e150a73879f8ccc6e0aee32fc955e9d662504fa92cc4913f
+DIST firefox-84.0-ka.xpi 579054 BLAKE2B 4380bfa016e770ca96fd18653fc8e96dc6763ec85ccbcba064e632947774a854bd896ab63f07d393c81daadc70f494dca98088256613283b0e25527e33889357 SHA512 d1d7fd4ac9120b63e073b2ca5fcadd6cf9ffb9e5a6e29f30dedc960aef99cd162bfc1fd92c4b348cf4140b11ee013dd4491d2099565e82176252a0e00d45230d
+DIST firefox-84.0-kab.xpi 538410 BLAKE2B eef8b4a1bb30fb1a204d60791cf6922d17c3a954e131ff8a7f9240b2c0d070648a08353aa9a83066b48d90510b53a406837e3211822cbd17a25cc8f7c4e77447 SHA512 1d4770edbe5839ca6b2b8edb3e2d357d19025faf66989a3dfa07355d193d833d89ae2b19989688dfcbb47d1709849121249dd8498a8b5f25f57a63100715c15a
+DIST firefox-84.0-kk.xpi 591061 BLAKE2B deab9087e8354d79b0629d8f75915071cfd8a80d654723d77f24a5e9b123096e8dce49319654f3b669f9cf04dd377280e9ea4ed45cd8e83934daae8415b7e6de SHA512 c8f3ca399159ea43ca38468f2c2fe6ece2ed6d83b052d5759c1557b0c688c40b75b05bcd3bdf9fa963e52360d6d1bf6a8004531d03de15e62abf04cf774d5448
+DIST firefox-84.0-km.xpi 527419 BLAKE2B bb062f57a2c7aa21409fc99c05edc504b87ad5fe1133461848387866cb31fe3b2e9fcde6fdd3e1c2f12723dd593e0fbe0afdc4db256b479d1a72deba30c6875c SHA512 6b737d96c560b55d708ce92d234c0fc4a3e87d105ffe5ab8fc89057af51bde2eee2c95f04a1d0ce6e545e0b76a9d34f15724a42bfed9782d2bc1e6403d7e3c87
+DIST firefox-84.0-kn.xpi 506712 BLAKE2B 25282bcb3f26942789f7569d425f6f0179e724cdb22ff00f67c1f95aa7302237cf4d49adaec1a1e1dd9d6f8f0792683bdb1e7adbdef6a32f6b2519de40d075f3 SHA512 ed99c461288553274caa6de3cb865ac363cbf8a1a7ff795e23aa2edb77eaaed6386781d62417841093174ebc46351e5d7c026b419dfcc562afcad612f7fb4e20
+DIST firefox-84.0-ko.xpi 564748 BLAKE2B 56ab2ccec37b51353838baaf6b50912726501d571dce0df5a94c07b82db4c289bdcf67be082a3ae0853eb240383ea0bdcdd92c4540ee40d03bbfce49b72a2104 SHA512 d3f293c4e4c7d5f77ab87622ef7fc533c6b68579f98c09295efad0a60467fdc03aceb5b71bfdf145fe1ab7cd11629741b729e21fddd780c3e13b7c4dae0cda7f
+DIST firefox-84.0-lij.xpi 476806 BLAKE2B 10bad1cd516fc22fea2a495fcf910b6b2f20852a66442c769e06f4e4c0829f7400148b678a2f7359e7133937deae6f0568ffee0ded28b748fc04a1efb6de328d SHA512 dfda924231008a482d415eec90b18eb3d70e8f4b43a6d1826dbcd11ee4d39b4f677ac2fab9af071af3a5abc6acab69c0f3aa7d7b2dc041017841e3b49e0f2f7c
+DIST firefox-84.0-lt.xpi 547535 BLAKE2B e625e6988dddc081c6617aa6506c6b2ef768759df4bc4642b0cc93421569a0c93da7f76acc80cda5e4c1bf1debec2885f2e588b774f0ae0d60cb2a59986cb1e3 SHA512 9bc553ab3d09a963f0bf4d29517c711aac28c29426ef6e2d84ab4ac5980fc0fe4fc1206305edcafecc9fc4d0ecb56944325674291526e3cc6418f5ddcb7d364f
+DIST firefox-84.0-lv.xpi 470837 BLAKE2B 2dc830f7354b6094b2fb6dd302227df015992ee577107a566bc6f073829a1d07e4e6e6112c8ef8ee12226740e57635ea5a78eef2d825f490b86ab31acb38778b SHA512 db1009a2f7e0fc1b4de620c51374502601fdd9dc18ca1d1cd4f4d7e349a473543b8c901f42b10c14a0789d21200d415b153faf9de869d7a93e503e48183fecd2
+DIST firefox-84.0-mk.xpi 459824 BLAKE2B c92bc80f04841a4b831838fe7a4ad0e0c200c3a06b09d6239ccba87af5d3ad20220a3c31b267e1183d1c0b2f0461b620ad576c634c34bd2b2bc872b414767933 SHA512 c6504900a0179f7c65a24716fede62f027ac4c3332fa4e0329dfc6b333643e396fda636f9b3f852b69d016dcd9a34b632143393d4d6742e0220c5e9f789b9658
+DIST firefox-84.0-mr.xpi 541982 BLAKE2B d2e96dc56c627a4a355574e2604a68a85d8edf8ed9f060617af87405f519a6246ec1c967c1fe1315a06328f45134004769b4f3d5cea67c413a7309173a53c581 SHA512 cddc0de257a6812ff7920eb6ea297d8456696746492840ab47f9cc5243b5fe7fdd4c133f765873db73708e2b31d59d36e7c5b3243bd1959457e2a10ad9181826
+DIST firefox-84.0-ms.xpi 454814 BLAKE2B 70a6bcf169de0b5216a3a8114dcd3f98d60f77fe5ddcd24b344381ffda66c758c59dce4b0b0d8b5955bf6464ef5cf6ef15adb24a3c8e475c1a9b796b57200d75 SHA512 d87912ab922cee6591b93903b6ed109c7c19add0c761e68afeaa93472f07d1dc93db2edb9cefcd0471f42c230eae98e169a25cd9c41a357783b5f887a139e143
+DIST firefox-84.0-my.xpi 526527 BLAKE2B 7f3c3c94f566a57c3ec29b848021f4bbecbf803adab21497909cbb037674bd4ebecca9994ded00530d917b965c4d3a3559cbbf03f9160d10ac811f47e8f206e2 SHA512 0e9c858ab9e278421ec09c728329df7cf04060c35ff7c56c6d67de8d25e1b1f21044845e04d1c747410ec6d2132a017589a4571dd4ef9e5c7335abab33126951
+DIST firefox-84.0-nb-NO.xpi 516938 BLAKE2B 83dc51cb38a223606e8aa7f074284a14e2f1ad0b9aec47b6da08c0dd4f8d11ed184217502961b1437dceb890e69c9bf4a88fd76d64c6fd8371ab5f4b4bc1316d SHA512 2df0cabe58df1094fe4f8a02f2511e64db788f7f7ee19a0024428159aa770a105637a78c2a0dca7c2b40100aea8f804d78329f9a8a19c4652c4ed99a60279dd3
+DIST firefox-84.0-ne-NP.xpi 483416 BLAKE2B 1c81110518ee4bb5b7818cdf87e67209883c83283b66ab72397ac6c482128c96f3ec2bcba864aa89cbe8ff9b7e3a014c3100f32ffa17418acfdffb433010097b SHA512 1b27d3e7a0dc66988ccc4436acba437956c11197e910f02b9555d8ea8ff711bf0f44540f239075c972bcee3e73018fa14c1cff5769634b224565b4073d54d1cf
+DIST firefox-84.0-nl.xpi 524178 BLAKE2B 404aeffb8d82192d7e681c32bd0a085d5498f3987de77962309f9c7d7d66ee8dbe576028b86d1700014a7aca72e6430def844f00cf7a40ba99208dcbe4b02a0b SHA512 eaedb9e77012b7f1d8460977b63443b4cb553596524b33ef276c78e56a68b8cc527d724f21d7fa80e44cf68c37261e6fd8eb082179c064953cec92a9f80cde01
+DIST firefox-84.0-nn-NO.xpi 517874 BLAKE2B 09f2f0fb088512c847fabec49203b26d6e729a2d221ea72d44999a9db9863c51d634e47c59fa82d89c94df9017ebbecc8ecebe086263b9dd9f043af077a59dad SHA512 a2ac5595807fe3bad05322b8a677249cce47feebc8a56468069cc1e4ae4d4901904634723ca341c0211424e70911b233153c3782d6e5d34893f7ad0eec18cbfe
+DIST firefox-84.0-oc.xpi 540049 BLAKE2B cd370ca0a2ad015d1aef64762503da3d7399c977ca58034d60218b1b2a7724f60f357614c7e81f637e9586c56c171228a7422f03ee71abf27e5adad6c2398645 SHA512 d93c92335ac6b2242d620fccf97865ea4f658537ce459f366562ab2740852c87c57124c32522d1a3fa03f050d7a4b09bcbbbc2b83eaff65925dd78c9c8923679
+DIST firefox-84.0-pa-IN.xpi 584955 BLAKE2B 7e0ebcbdd4738da367e8b31b741fc3175e21a1b591d969554833556b3e7ec5282c0c4959db26bbbd5be23a4c6a302b2122b8876c9a080a91e867f7a7c62e0f9c SHA512 8e7108a94030c9651a2e523d2758cc76b4297f262cbc9d7ad44479bc583a038db3fdf868d45713b69a5b2be9a6a3e523cecc9aca808f7f03833bf9cf38dab846
+DIST firefox-84.0-pl.xpi 543364 BLAKE2B 1fef08c91adf72c8c7659e6b679820bea030b2758e3db5b89b8de9a23c628ff290d09059b3115ad29247c6d689c798825c31c4fae1d35eb0257313541c065143 SHA512 274cdeb1651dfcf4f9d4341e940d44808a39a1e9824f0159cb293c0df3d1aec7544494a528e1af1e58f36aa46c8380bd3e0505df33306897f3a42cc3a9978f45
+DIST firefox-84.0-pt-BR.xpi 525585 BLAKE2B 51742a667b6033ddce2c0a35b50c1f36b40fe485210776d21c5d3fefb566567ca54b0b02cdc7dfd31857718d142933d8b595dc860c02eb253ddf78b553de0b8b SHA512 16032ba444f3e4adf597ae73a23b65f2941efb9e29228fc511ef2dba5d5577347cdcc11bd57be1e899beb428ba46d3326ab8a4754fa2af4f06496ac9f11b4320
+DIST firefox-84.0-pt-PT.xpi 533312 BLAKE2B f3696839351cd10ba2a556b29530bc74c81e5e3c86fb2ced3e0232a44312ec96574614954de9671764958da117daeb1bf70ab307d3cb2801a903643526c23400 SHA512 125c834f801977468d0e8ed31a5c99ab65a6e92f191c31264758ccf407449d2a4694df7ca967a016d0adbc45f007674be3320e9124a7db135f7db0860f201829
+DIST firefox-84.0-rm.xpi 524836 BLAKE2B e60a67a9993bc54d93cafc1a8206c107d030199ba4150d78ff3d213058633c63741033c0aa8bc5218935f33d8d207f2cf6e3947b2a29125757178bbc187dc55b SHA512 417cb841707ff2200629a9e833c7966ff95541a3efbd3d148c90205db284e8f346e2e91ec752f6c32878c17a2487cedc4696e96ec6d75d3b7062ceb0d00a56c1
+DIST firefox-84.0-ro.xpi 532968 BLAKE2B 8ff1442c8cd5f4329d7313503b1d6da54a66f8e19996ed593a87bca2452ce589acb272c8c808e9745e1ad6b6d73a1b9366d7aece8b2e0ef92b29f833d6d7b5c3 SHA512 b4dae10fffcf6f2bb8f1de1db2748adf5a48f0898de9e3a6a1676905d53888905f81ce8280c5b279ac2ec13d830d86f65f724680b2492a179ca0c6fc7e9d84fb
+DIST firefox-84.0-ru.xpi 611899 BLAKE2B 8733ba5d9e3b5a7e0aacae69069c7e885583666715509fc272cefb677d50bc9ac2f7327b9d277818d281c36a80b196a303706b07deaa755e60765ae6cade4f26 SHA512 43550c1547aa96d164c1290ac9284d5f13c9b972f1084685b52dac273f962a8339218c5d41d4ca3e690d6194dd6e42c14d8eb5c8aed7867b4a469082d1447a19
+DIST firefox-84.0-si.xpi 492923 BLAKE2B 6c946c3dadf47ef8e9051a6e37a1b338adb9c2c20ca2294b48bbd7d7ad1fd7b337a78ae03b07261b6ebf76d13977102a418dd6bb9ef16f7484c24e5b3733ce1a SHA512 4e5adc12e09d09c8b13b6d15ae3e2faabc08e1d7547625ce95b6679e0d7e07e0309bd94abfaa454ff6f4179280cbb505fc3abd6b9051b58ef0d1aad64f776fa0
+DIST firefox-84.0-sk.xpi 538489 BLAKE2B e88c35fae89b9135c85b04018f5207dc3dc44aabeac1d68e87c4931cc05732f540ebcefc943a1c5cbafe06a510439afbd33c50cadea0ec6ad6f6e81c501e76a7 SHA512 5e802fffebea95f4bff9b11fd64adf2256a9712d8add1314ad6bbdef1d32e1f3ef28a99847cf17fd795d111209b5ded7c44589e87df7f4639e4106d3ec973ef0
+DIST firefox-84.0-sl.xpi 521132 BLAKE2B e71e87bca7b6dbbb38729e549a27ed22ebfa9b93c268d502fa1dced2cba38f9480b6dc4b869bdc8f52fa62452760edb00b874cb7e0d0963213eae9c5e88bc081 SHA512 e17ed51af13db97db9ad64f86bf126d9043d98023c06b5e1f56348f26def30af726d89fb7580f6673e6892bac97c1c3fd16e2ac09814a3f35ba0e8d398c845f6
+DIST firefox-84.0-son.xpi 425697 BLAKE2B 948e9e266813507894529eb3648436d6b930c8eae19a991789a4eb8a5870754ae60e94f07337a14d5069693512c72119d5a91a73b53e518213fa15c1a5a32a3e SHA512 64b222f00a497538f6b19e6e26c5d4cb98e23bfe5884539e927dbd72a505d3fabfc96ab26bcbed52f24891786208af7a303d2efa006f1819c4f715b6dbd6ed80
+DIST firefox-84.0-sq.xpi 542776 BLAKE2B f776b2242db19a71a71f67cdfc31cdcddf20c1a98c7803834538383159c3c064c1859913a2e0654299e327b897596d3e80c87684562b9bf8fa83ec4d72ca5520 SHA512 0a0e26cf5650257172d6984ae84e5e22ed6d78b8039d31eebe0ffcf6c2b4fe7af7ba410f9ab0604c0ed27587c11564d40281c9fdd3ffb4e3f305b9e350943d59
+DIST firefox-84.0-sr.xpi 563746 BLAKE2B 5a75b1fb67ca35eb8a287a704906c15ae20e279a51058a4ceea83b6aade588def50184160e4e8a82dc09d2fba1395d39191c86fd0d7cfc0f16d30bf4501c5725 SHA512 91a11d128e63b08465f9ebb7b42df96eb01c6dd1a5b0323df414c88d48b6da0869d4c48324fd1348d5c16ea1b63e323d696bb4d8551641dbfb2c3e632c12f4a8
+DIST firefox-84.0-sv-SE.xpi 527551 BLAKE2B 42e258161dd1970c231c6280ec42739dc000ea19b2ac9e1e174e722a5d719c9e6e249a4fd8a805bde5deca1d403856f28a1fa34d8b95ccd37751cdd9a08600a5 SHA512 da4a58d6e169a6840ca5fd7aff34b20573a3e80e90cdec6f3c9b7e5c8dfb9a7d97acea76a49ee6c4084fa719deda71ce670da7dc221ad3bd66e3acbccb3740fe
+DIST firefox-84.0-ta.xpi 521655 BLAKE2B c7e9cee0d581205ac00dedcec4494ca1914ae8e8f915b9464c6dadd45d2c2781ccd1fabdd16c3459f7d616d267fb36797db4a34571d18b74ce5eb75e8ba4e63a SHA512 86cb7f221eeaa52c97d54dae556a8718a6560ee40be2341c5d39fb424268df72867be48649a489009c0bfdd5b4b2f5a6d093bc8ae68be29ae7e722d785b683fb
+DIST firefox-84.0-te.xpi 558108 BLAKE2B 324801fd9496992e4e58ad1b3b7bf4df14c13e276dc76fe6b25d91fef6dbf1cf0338530031f4acacd5b747541a78ce9636afc1a6f59ea87aa916a9a262f8e71d SHA512 835901a98b950c1ba9db3abfae5b0ceac6b883673152274e52e35f1ba171b1b830b5febdea27914966c4b0633a216013581335a7e20db894889de78e9e4cade0
+DIST firefox-84.0-th.xpi 592812 BLAKE2B 39b41a4be7e57a70231add8156d8b8a781449443967f5f59821e9cf481e9b6ae2601021b77ff550ceeced447ecdcaee8f3ada0094e36e12106ba771385767d71 SHA512 578340f0e4228590851d1d77dbb3b14190cacdf45892ec89e1451875f087fe1c0663990bcd17554913303a7bce8bbdb2f32ab1706e475c8559da6ac9b5419a8e
+DIST firefox-84.0-tl.xpi 519348 BLAKE2B 38438bde658219211c9961ab2d93164160b222013e1cf52cfdd49a2253a8c0fa86f639a089fd20519a32b487f2b33d003a9835b93c67fe0bc81cb21a18a7197f SHA512 dc452dab869948160ceb9215c07cbe85bddba11c0569b76cd0450653ce10bcb8b9a67637c375f17456dc5f3b0c2b616ad34736d6f013cc6823094c0eab1e9fd4
+DIST firefox-84.0-tr.xpi 537926 BLAKE2B 071e5639393cf555e50c0e736c056898337a6a5e9865c8012fc6785e56df5d2f13f9701190a4a7fd5a9bb5317a42d69f337772c9695adafbdb305a54bf9d2422 SHA512 a27f55484a16abb6f6a34fac8cad4f1eb3022803de29e450e126d8bd3f77439ade3efc2a01e88e71cbf256733c6dbb1b8468c0184a3aad37512ed1fa17c864a2
+DIST firefox-84.0-trs.xpi 500696 BLAKE2B 84c38eab50465ca5d28208da45082e3fad5a89bcb0d03957f88cbe8663b855d419d00e9f895421df85143ccf3cdd562047af47bd2a03fd4ff78d6604a7a9d3b5 SHA512 4c00f609582d6f72178116c2f2b777387efc381959630c1ff797cd5d2e82c5e514c649bce76bc2cd45f44010db26b8e808c1b91b8539dc4e187466789e388f10
+DIST firefox-84.0-uk.xpi 606063 BLAKE2B 87d8f8d0329796484d3192aac2321a851c5f43a4a021cdfaad33d2753a8cba0c4b2516e4939876a44bd9e1ad0fa34426b067649d94a25ee935455be85433a587 SHA512 76f7422733523e9543300f9ecf4f9c71cb85d30ea036664add9256431be29c33e2f4d38ecb51c3ba39bb3326a5e2d70c916f13784f5357f735ed37257b27950f
+DIST firefox-84.0-ur.xpi 558461 BLAKE2B 892df8ec9b550e10e92f043ed5f88d9047190bcd9cd476117215fcb6519cc251b7606b637d3748bea4f32c4a9dddc37abd283d629e23b0ffaa07676d730b361c SHA512 a90d63beb94993dff11601ed59bfcae6d0ed6a549fb57ddb29f4abe55c33f0bde577553027b5900e64310111388c4d81b4db97f803263f886c90cce45d47ea61
+DIST firefox-84.0-uz.xpi 478518 BLAKE2B 0d61aae634957f392cb4d86ab510fa61f8357c61b7e05c5610b87ef7288da5bda6e2f4bd2cfe86b0c69fd8c6c369d12373207fe26ca98ec772db9a14a641c4a8 SHA512 a3b7a55603171c4c2892fbf5b88c3af9d4f54b52036b71211399fe96a1700a5577a87f2fd1418c3e07d59263d745ba609f7199f66236fa464237eb73a8b91dc1
+DIST firefox-84.0-vi.xpi 561443 BLAKE2B 675dbd685bc0215333e0d282d48cc2fe51f596134009ac93f9d5f6d8c572098996442de8b89ca26fa4a837e0ed4196e2317d7a5f459bceb2af17a46feb62152a SHA512 10f814e3287a5a6b050612b0a21914c306f3de258471ed0e68b37d6b8c669f263487e3c88243d809456fe91a7ade848ac45f65765af4f4f90fa116f3a7f76334
+DIST firefox-84.0-xh.xpi 427842 BLAKE2B 4c3cf47012d70110d912f7209d3ff44b3ceab98402b2fbb333e4527752966bfc309e74ae2ad0cb5853d7ec5c24abcb1af5dded72c23847c498fc9b6f0a168cab SHA512 333de2aa39179ed805a2848bd432720e1a2795d6ddcef1a2a241b1906c6fc3de608a27b0397e5d7a247411d8efb7fb771559d3429d575ad78d45c0af09737fb8
+DIST firefox-84.0-zh-CN.xpi 562147 BLAKE2B 67aab75c9f5fb8f21aa90996ca54e865f43d99e1e52a98ed44a23588395dc967589f5793a44a35cdce8c2ae929bffaefeca7698871d08266541b934f71ddabe7 SHA512 36e675f8b3f70f22e4cb51f7119cdece72ac799abb4c0d5e7be313469f75a0300b9b446cb9b66f18e27f3f6eabea6aaa51f65af5bf6a292384fd4f2d30046ba0
+DIST firefox-84.0-zh-TW.xpi 562093 BLAKE2B 6f6f76fb54c351ac68f1e898b96623223e5dd16dc9585f317096971fc5168b981f9d1e29ace9aa177354766e8099a586547a9e3f512ee29abdb5ad84f2f1d14b SHA512 2c8feee6c2db327f2de3d6489577f9e187122d6d596cf38d7575064425b0f0865920cccad46a89756e6550e921046069197169badce768b5af605a92f12298b5
+DIST firefox-84.0.source.tar.xz 366395172 BLAKE2B 63b5300fb4eaf402ccde7093cc1cef462109f2cddacec966e7b3d7d3d4dfe2da7184871ceae661f0a201d33d03550adffdcaebb49b45b605e54f3cb3458a70d4 SHA512 6ad94617ee7b30c23c94dc5a0e0a5aded0022a91b7cbe393284659227e3a5e2390ce4438a459e9789291fa6ace787429388ce715ae1f758446b3c2e682c1d2ce
diff --git a/www-client/firefox/firefox-84.0_rc2.ebuild b/www-client/firefox/firefox-78.6.0.ebuild
similarity index 98%
rename from www-client/firefox/firefox-84.0_rc2.ebuild
rename to www-client/firefox/firefox-78.6.0.ebuild
index 3c6ce4f48f08..c2e869acd794 100644
--- a/www-client/firefox/firefox-84.0_rc2.ebuild
+++ b/www-client/firefox/firefox-78.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-FIREFOX_PATCHSET="firefox-84-patches-02.tar.xz"
+FIREFOX_PATCHSET="firefox-78esr-patches-07.tar.xz"
 
 LLVM_MAX_SLOT=11
 
@@ -14,7 +14,7 @@ WANT_AUTOCONF="2.1"
 
 VIRTUALX_REQUIRED="pgo"
 
-MOZ_ESR=
+MOZ_ESR=yes
 
 MOZ_PV=${PV}
 MOZ_PV_SUFFIX=
@@ -57,9 +57,9 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
-SLOT="0/$(ver_cut 1)"
+SLOT="0/esr$(ver_cut 1)"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
 	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
@@ -72,10 +72,10 @@ REQUIRED_USE="debug? ( !system-av1 )
 BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
-	>=dev-util/cbindgen-0.15.0
-	>=net-libs/nodejs-10.22.1
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.21.0
 	virtual/pkgconfig
-	>=virtual/rust-1.44.0
+	>=virtual/rust-1.41.0
 	|| (
 		(
 			sys-devel/clang:11
@@ -113,8 +113,8 @@ BDEPEND="${PYTHON_DEPS}
 	)"
 
 CDEPEND="
-	>=dev-libs/nss-3.59
-	>=dev-libs/nspr-4.29
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
 	dev-libs/atk
 	dev-libs/expat
 	>=x11-libs/cairo-1.10[X]
@@ -648,6 +648,8 @@ src_configure() {
 		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
 	fi
 
+	mozconfig_use_enable screencast pipewire
+
 	mozconfig_use_enable wifi necko-wifi
 
 	if use wayland ; then
@@ -804,9 +806,8 @@ src_configure() {
 	# Disable notification when build system has finished
 	export MOZ_NOSPAM=1
 
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	unset XARGS
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
 
 	# Set build dir
 	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
@@ -851,10 +852,6 @@ src_compile() {
 		gnome2_environment_reset
 
 		addpredict /root
-
-		# During PGO, build system will re-run configure.
-		# See comment in src_configure for details.
-		unset XARGS
 	fi
 
 	local -x GDK_BACKEND=x11
diff --git a/www-client/firefox/firefox-84.0.ebuild b/www-client/firefox/firefox-84.0.ebuild
new file mode 100644
index 000000000000..11727f10df3e
--- /dev/null
+++ b/www-client/firefox/firefox-84.0.ebuild
@@ -0,0 +1,1105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-84-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=11
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.15.0
+	>=net-libs/nodejs-10.22.1
+	virtual/pkgconfig
+	>=virtual/rust-1.44.0
+	|| (
+		(
+			sys-devel/clang:11
+			sys-devel/llvm:11
+			clang? (
+				=sys-devel/lld-11*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.59
+	>=dev-libs/nspr-4.29
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
+	fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
+	ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+	nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
+	si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current CFLAGS:    ${CFLAGS}"
+	einfo "Current LDFLAGS:   ${LDFLAGS}"
+	einfo "Current RUSTFLAGS: ${RUSTFLAGS}"
+
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_ac 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build CFLAGS:    ${CFLAGS}"
+	einfo "Build LDFLAGS:   ${LDFLAGS}"
+	einfo "Build RUSTFLAGS: ${RUSTFLAGS}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local wrapper_wayland="${PN}-wayland.sh"
+	local wrapper_x11="${PN}-x11.sh"
+	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${MOZ_PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command="${PN}-wayland --name ${PN}-wayland"
+				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command="${PN}-x11 --name ${PN}-x11"
+				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command="${PN}"
+				;;
+		esac
+
+		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/${PN}" \
+		"${ED}/usr/bin/${PN}-x11" \
+		"${ED}/usr/bin/${PN}-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+			-e "s:@APULSELIB_DIR@:${apulselib}:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 0c2e2c107124..fb5f730bad9f 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
index 5750ad332e59..d07b1188f95b 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_INPUT_DEVICES="
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
index c72e23e56b73..b35879117473 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="metapackage"
 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="+fonts"
 
 # Server
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index eb3d9cf50116..d9b0cc40bf2f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
index e02e9d3292d4..074ebe955e09 100644
--- a/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
+++ b/x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
@@ -7,5 +7,5 @@ XORG_STATIC="no"
 inherit xorg-3
 
 DESCRIPTION="Elographics input driver"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
index 45f5d4cd148b..c3d28955e86c 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Generic Linux input driver"
-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-base/xorg-server-1.18[udev]
diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
index 67cd6d23adae..34cdc10a84f3 100644
--- a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for joystick input devices"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.10"
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
index 9e20d2a9a8c7..ab9e4ddef1aa 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.30.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="X.org input driver based on libinput"
 
-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=""
 
 RDEPEND=">=dev-libs/libinput-1.7.0:0="
diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
index fc14656a4b3d..c01eaf9d4ceb 100644
--- a/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="null input driver"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.9.99.1"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
index c9973eee932d..436ff4aaa8a9 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-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="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
index 3b034f9cb614..4f78d63d2c5d 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-3
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND="${DEPEND}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f4c7c2c3ec84..d8ca6df38a21 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index 3a1ddec1798b..d854bd242b12 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a98cab801b32..deb8c60b780b 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
new file mode 100644
index 000000000000..32a0358b4211
--- /dev/null
+++ b/x11-misc/i3status/files/0001-Extend-battery-handling-on-OpenBSD-351.patch
@@ -0,0 +1,98 @@
+From 3a51673c05142b99f8db6a0bd9b8e4b806efeb72 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 8 Jul 2019 17:53:25 +0200
+Subject: [PATCH 1/7] Extend battery handling on OpenBSD (#351)
+
+If acpibat watts value is not available, try current (for batteries
+that report in amps), then convert to watts.
+
+originally submitted by @jcs
+---
+ src/print_battery_info.c | 47 ++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 45 insertions(+), 2 deletions(-)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index 1c51624..e2a790c 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -20,6 +20,8 @@
+ #include <dev/acpica/acpiio.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__DragonFly__)
+@@ -31,6 +33,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__NetBSD__)
+@@ -269,11 +272,16 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
+ #elif defined(__OpenBSD__)
+     /*
+ 	 * We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and
+-	 * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and
+-	 * probing acpi(4) devices.
++	 * the generic interface on macppc/sparc64/zaurus.  Machines that have ACPI
++	 * battery sensors gain some extra information.
+ 	 */
+     struct apm_power_info apm_info;
++    struct sensordev sensordev;
++    struct sensor sensor;
++    size_t sdlen, slen;
+     int apm_fd;
++    int dev, mib[5] = {CTL_HW, HW_SENSORS, 0, 0, 0};
++    int volts = 0;
+ 
+     apm_fd = open("/dev/apm", O_RDONLY);
+     if (apm_fd < 0) {
+@@ -311,6 +319,41 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
+     if (batt_info->status != CS_CHARGING) {
+         batt_info->seconds_remaining = apm_info.minutes_left * 60;
+     }
++
++    /* If acpibat* are present, check sensors for data not present via APM. */
++    batt_info->present_rate = 0;
++    sdlen = sizeof(sensordev);
++    slen = sizeof(sensor);
++
++    for (dev = 0;; dev++) {
++        mib[2] = dev;
++        if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
++            break;
++        }
++        /* 'path' is the node within the full path */
++        if (BEGINS_WITH(sensordev.xname, "acpibat")) {
++            /* power0 */
++            mib[3] = SENSOR_WATTS;
++            mib[4] = 0;
++            if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
++                /* try current0 */
++                mib[3] = SENSOR_AMPS;
++                if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
++                    continue;
++                volts = sensor.value;
++
++                /* we also need current voltage to convert amps to watts */
++                mib[3] = SENSOR_VOLTS_DC;
++                mib[4] = 1;
++                if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
++                    continue;
++
++                batt_info->present_rate += (((float)volts / 1000.0) * ((float)sensor.value / 1000.0));
++            } else {
++                batt_info->present_rate += sensor.value;
++            }
++        }
++    }
+ #elif defined(__NetBSD__)
+     /*
+      * Using envsys(4) via sysmon(4).
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch b/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch
new file mode 100644
index 000000000000..be9a08e32cc0
--- /dev/null
+++ b/x11-misc/i3status/files/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch
@@ -0,0 +1,33 @@
+From 70b954b122c1dae1d21593d6a5239d38fde1fd55 Mon Sep 17 00:00:00 2001
+From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: Mon, 8 Jul 2019 20:14:59 +0200
+Subject: [PATCH 2/7] Fix headers meant for OpenBSD, but snuck in for FreeBSD
+
+---
+ src/print_battery_info.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index e2a790c..1768bc5 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -20,8 +20,6 @@
+ #include <dev/acpica/acpiio.h>
+ #include <sys/sysctl.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+-#include <sys/sensors.h>
+ #endif
+ 
+ #if defined(__DragonFly__)
+@@ -33,6 +31,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/sysctl.h>
+ #include <sys/sensors.h>
+ #endif
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch b/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch
new file mode 100644
index 000000000000..a1ac91ff8f21
--- /dev/null
+++ b/x11-misc/i3status/files/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch
@@ -0,0 +1,56 @@
+From 1999d5cf555c6f373549840d40f8565dcabad93b Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Thu, 11 Jul 2019 15:23:08 +0200
+Subject: [PATCH 3/7] conditionally compile pulse.c only when using pulseaudio
+
+fixes #352
+---
+ Makefile.am  | 7 +++++--
+ configure.ac | 3 +++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb251f0..c2c1c0a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,8 +68,11 @@ i3status_SOURCES = \
+ 	src/print_volume.c \
+ 	src/print_wireless_info.c \
+ 	src/print_file_contents.c \
+-	src/process_runs.c \
+-	src/pulse.c
++	src/process_runs.c
++
++if PULSE
++i3status_SOURCES += src/pulse.c
++endif
+ 
+ dist_sysconf_DATA = \
+ 	i3status.conf
+diff --git a/configure.ac b/configure.ac
+index cf9e430..95009ac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,16 +80,19 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
++pulse=false
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+ 	PKG_CHECK_MODULES([PULSE], [libpulse])
++	pulse=true
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
++AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch b/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch
new file mode 100644
index 000000000000..579c74e7e09c
--- /dev/null
+++ b/x11-misc/i3status/files/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch
@@ -0,0 +1,26 @@
+From 02a47cd19641a04f6cf8d486cbb8882a1819c661 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Fri, 12 Jul 2019 14:38:43 +0200
+Subject: [PATCH 4/7] battery: include sys/sysctl.h on OpenBSD
+
+This is required so that CTL_HW and others are defined (ran into this on OpenBSD
+6.5).
+---
+ src/print_battery_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/print_battery_info.c b/src/print_battery_info.c
+index e2a790c..a36b05f 100644
+--- a/src/print_battery_info.c
++++ b/src/print_battery_info.c
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/sensors.h>
++#include <sys/sysctl.h>
+ #endif
+ 
+ #if defined(__NetBSD__)
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch b/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch
new file mode 100644
index 000000000000..8ebb296f7ed0
--- /dev/null
+++ b/x11-misc/i3status/files/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch
@@ -0,0 +1,56 @@
+From 54e798e3a6dcf5747c3e943b376ae441ee0534a4 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Fri, 12 Jul 2019 14:45:34 +0200
+Subject: [PATCH 5/7] configure: disable pulse on OpenBSD and DragonFlyBSD
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This matches the conditional compilation in the code and is more correct than
+distinguishing linux vs. non-linux (which breaks on Debian’s kFreeBSD and hurd
+variants).
+
+Thanks to sdk for providing an OpenBSD 6.5 environment for verification. This
+has not been tested on DragonFlyBSD.
+
+related to #352
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 95009ac..a6c31d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,19 +80,25 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
+-pulse=false
++pulse=true
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+-	PKG_CHECK_MODULES([PULSE], [libpulse])
+-	pulse=true
++	;;
++	openbsd*)
++	pulse=false
++	;;
++	dragonfly*)
++	pulse=false
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
+ AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
++AS_IF([test x"$pulse" = x"true"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch b/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch
new file mode 100644
index 000000000000..171a1c39cfd2
--- /dev/null
+++ b/x11-misc/i3status/files/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch
@@ -0,0 +1,24 @@
+From 667e38ababb69b68ddcd3c453bd78f022198559a Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Sun, 21 Jul 2019 21:17:59 +0200
+Subject: [PATCH 6/7] On NetBSD, include sys/socket.h for AF_INET{,6}.
+
+---
+ src/print_wireless_info.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c
+index 8b2d210..6215704 100644
+--- a/src/print_wireless_info.c
++++ b/src/print_wireless_info.c
+@@ -61,6 +61,7 @@
+ 
+ #ifdef __NetBSD__
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <net80211/ieee80211.h>
+ #define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
+ #endif
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch b/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch
new file mode 100644
index 000000000000..e60a1375fec1
--- /dev/null
+++ b/x11-misc/i3status/files/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch
@@ -0,0 +1,119 @@
+From 23da59920c4c911ee08498eb283b69bdef80fd65 Mon Sep 17 00:00:00 2001
+From: Michael Stapelberg <michael@stapelberg.de>
+Date: Mon, 29 Jul 2019 20:57:48 +0200
+Subject: [PATCH 7/7] make pulseaudio an optional dependency, follow best
+ practices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For my thoughts about optional dependencies, see
+https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/
+
+This commit follows the best practices outlined in that article:
+
+1. The travis config was modified to verify both code paths build and link/don’t
+   link against pulseaudio.
+
+2. If pulseaudio is missing, the build fails until packagers explicitly pass a
+   --disable flag. In practice, I think the only situation when this flag should
+   be set is in source-based linux distributions where users can express
+   package-level compilation preferences (e.g. Gentoo USE flags).
+
+3. The --version output now reflects the status of the optional dependency.
+
+fixes #359
+---
+ .travis.yml        |  5 +++--
+ configure.ac       | 25 +++++++++++++++----------
+ i3status.c         |  8 +++++++-
+ src/print_volume.c |  2 +-
+ 4 files changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a6c31d7..11caa33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,25 +80,29 @@ AC_CANONICAL_HOST
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
+ 
+-pulse=true
++AC_ARG_ENABLE(pulseaudio,
++  AS_HELP_STRING(
++    [--disable-pulseaudio],
++    [build without pulseaudio support]),
++  [ax_pulse=$enableval],
++  [ax_pulse=yes])
++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
++pulse_def=0
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [pulse_def=1])
++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
++
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+ 	;;
+-	openbsd*)
+-	pulse=false
+-	;;
+-	dragonfly*)
+-	pulse=false
+-	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+ 	;;
+ esac
+-AM_CONDITIONAL([PULSE], [test x$pulse = xtrue])
+-AS_IF([test x"$pulse" = x"true"],
+-      [PKG_CHECK_MODULES([PULSE], [libpulse])])
+ 
+ dnl TODO: check for libbsd for GNU/kFreeBSD
+ 
+@@ -160,6 +164,7 @@ AS_HELP_STRING([is release version:], [${is_release}])
+ AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
+ AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
+ AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
+ 
+ To compile, run:
+ 
+diff --git a/i3status.c b/i3status.c
+index 0898da3..1ab8400 100644
+--- a/i3status.c
++++ b/i3status.c
+@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
+                 return 0;
+                 break;
+             case 'v':
+-                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
++                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
++#if HAS_PULSEAUDIO
++                       "Built with pulseaudio support\n"
++#else
++                       "Built without pulseaudio support\n"
++#endif
++                       );
+                 return 0;
+                 break;
+             case 0:
+diff --git a/src/print_volume.c b/src/print_volume.c
+index 91e8ce2..7364d47 100644
+--- a/src/print_volume.c
++++ b/src/print_volume.c
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
+         free(instance);
+     }
+ 
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if HAS_PULSEAUDIO
+     /* Try PulseAudio first */
+ 
+     /* If the device name has the format "pulse[:N]" where N is the
+-- 
+2.26.2
+
diff --git a/x11-misc/i3status/i3status-2.13-r1.ebuild b/x11-misc/i3status/i3status-2.13-r1.ebuild
new file mode 100644
index 000000000000..9107ec983b70
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.13-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps autotools
+
+DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
+HOMEPAGE="https://i3wm.org/i3status/"
+SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pulseaudio"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-libs/yajl-2.0.2
+	dev-libs/confuse:=
+	dev-libs/libnl:3
+	media-libs/alsa-lib
+	pulseaudio? ( || ( media-sound/pulseaudio media-sound/apulse[sdk] ) )
+"
+
+DEPEND="
+	${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+"
+
+PATCHES=(
+	"${FILESDIR}/0001-Extend-battery-handling-on-OpenBSD-351.patch"
+	"${FILESDIR}/0002-Fix-headers-meant-for-OpenBSD-but-snuck-in-for-FreeB.patch"
+	"${FILESDIR}/0003-conditionally-compile-pulse.c-only-when-using-pulsea.patch"
+	"${FILESDIR}/0004-battery-include-sys-sysctl.h-on-OpenBSD.patch"
+	"${FILESDIR}/0005-configure-disable-pulse-on-OpenBSD-and-DragonFlyBSD.patch"
+	"${FILESDIR}/0006-On-NetBSD-include-sys-socket.h-for-AF_INET-6.patch"
+	"${FILESDIR}/0007-make-pulseaudio-an-optional-dependency-follow-best-p.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable pulseaudio)
+}
+
+src_compile() {
+	pushd "${S}/${CHOST}" || die
+	default
+}
+
+src_install() {
+	pushd "${S}/${CHOST}" || die
+	default
+}
+
+pkg_postinst() {
+	fcaps cap_net_admin usr/bin/${PN}
+
+	elog "${PN} can be used with any of the following programs:"
+	elog "   i3bar (x11-wm/i3)"
+	elog "   x11-misc/xmobar"
+	elog "   x11-misc/dzen"
+	elog "Please refer to manual: man ${PN}"
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index f69e60c0559e..4655a3ada2b2 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
 DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9764f429edd4a65d173ff43c139083a8831d9ee68d3024c033f039409efd486178a6225d06e3313642a9918298b1b60da1da75d49243973f8e2dd1fc855f SHA512 27a90d80f2de45743c2347be5ec5c88db58c4f3bb2aa44093c2a1e3178bfd5761ec806bdec9c6b6a4de6d1e67d5f14d4518e99611bf7e2984cfc880898357133
 DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
-DIST polybar-3.5.1.tar.gz 282038 BLAKE2B 2b252c3bea296581160af74412485a6a19201c1a6666ef688c496294823380503574e8b912be4b9eb822214b6a696954ccfc3e3ca29303f751bfa6640988593a SHA512 835decbdfcf398d6920d871beace2aa3883977bec89c7d87f3bd650d05ef267cfa17d1df7fd79bcf685c79ea0c5c9d1d46c4ab32cffbfd85d44a273f0ae8b906
+DIST polybar-3.5.2.tar.gz 282025 BLAKE2B 9d9dbd94ff998d9e44fa52739f585dc3c602ef7fa05ac8c4e3d2a0ed9d62adf5a19aadbc2b923b51c57d5a6108807eaf1614987b6d2887dcd47b0e41bc07c1c6 SHA512 0dcd7ce1c7fd67839ce7ee16061aef760c1cce06cea370834aa1055b22cb40dcb8e059fd9f80b87223a76aad1d7967610318a64139f5adbd9d90790a6a4b0b3a
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
diff --git a/x11-misc/polybar/polybar-3.5.1.ebuild b/x11-misc/polybar/polybar-3.5.2.ebuild
similarity index 100%
rename from x11-misc/polybar/polybar-3.5.1.ebuild
rename to x11-misc/polybar/polybar-3.5.2.ebuild
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index f2d32aab71ae..419e55af09c0 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,2 +1,3 @@
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
 DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23
+DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
new file mode 100644
index 000000000000..44eda2ab0a9a
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.6.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable drun) \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
new file mode 100644
index 000000000000..1905fc552ea1
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
@@ -0,0 +1,42 @@
+From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 Dec 2020 22:40:40 +0100
+Subject: [PATCH] Check for dns_sd.h only when building GUI
+
+The <dns_sd.h> header is only used in the synergy GUI component.  Update
+the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled.
+This fixes build failures when GUI is not being built and <dns_sd.h>
+is not installed.
+
+While at it, fix indentation around the added check to match the rest
+of the file and avoid being misleading.
+---
+ CMakeLists.txt | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 581fdf77..35d806d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -235,11 +235,13 @@ if (UNIX)
+             list (APPEND libs Xi)
+         endif()
+ 
+-		set (DnsSdlib "dns_sd.h")
+-		set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
+-		check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
+-		if (NOT HAVE_DNS_SD)
+-            message (FATAL_ERROR "Missing header: " ${DnsSdlib})
++        if (SYNERGY_BUILD_LEGACY_GUI)
++            set (DnsSdlib "dns_sd.h")
++            set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
++            check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
++            if (NOT HAVE_DNS_SD)
++                message (FATAL_ERROR "Missing header: " ${DnsSdlib})
++            endif()
+         endif()
+     endif()
+ 
+-- 
+2.29.2
+
diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild
index b0539697f5b9..d144f9cb3919 100644
--- a/x11-misc/synergy/synergy-1.12.0.ebuild
+++ b/x11-misc/synergy/synergy-1.12.0.ebuild
@@ -53,6 +53,10 @@ DEPEND="
 
 DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
 
+PATCHES=(
+	"${FILESDIR}"/synergy-1.12.0-dnssd-dep.patch
+)
+
 src_prepare() {
 	# broken on Xvfb
 	rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 56046f272cc9..ae0fb438f780 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/icewm/icewm-1.9.2.ebuild b/x11-wm/icewm/icewm-1.9.2.ebuild
index cd8d3315fba2..9ae73f9de010 100644
--- a/x11-wm/icewm/icewm-1.9.2.ebuild
+++ b/x11-wm/icewm/icewm-1.9.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 92128b334993..e89926069502 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/garcon/Manifest b/xfce-base/garcon/Manifest
index 6899586d04a9..65cfd1761a8b 100644
--- a/xfce-base/garcon/Manifest
+++ b/xfce-base/garcon/Manifest
@@ -1,3 +1,4 @@
 DIST garcon-0.6.4.tar.bz2 519744 BLAKE2B 3d5e90d8a1159aac4eb2f2455978bbe1de99b523b5383037c021f3490800349bff1d6f5333853b08db34c9d18f3c5fc787f51927d94cfd2cd747e839b1529e38 SHA512 96a99eb163909ba411ca5928c3fc0a569a6d833fba92edcfa845eb90b56abb02e1428a2cbf61fc1c564f1659d51b24ce174e3864fcc987a37158703df0ac2510
 DIST garcon-0.7.1.tar.bz2 513717 BLAKE2B e87fb19ff0b3d0baf9e9def5ac028c481494334f425f28868c4e79b678e54ccdb925904980c5dc592c981c4159a8400af2d39f3350c525abef03622cd99d5be2 SHA512 90cc5c634200235a2a0d7f67584a14e32dedd9539bff627b699073a5d8797229245fd43a7256072cea40239e3b53da92691fec881195dc5d9d59f29e190054da
 DIST garcon-0.7.2.tar.bz2 514158 BLAKE2B b7f0048d10ac135fd49768a786a83fbdcf6d2fb979e440970c3192041459577b4eb79e655892561eaeff34b4485c6b485382d4642e7672de59b38e9cb5bcb9a1 SHA512 42a08043ba7dbd5b61c2368886f0610aa920fb34c8dc2fb2a5e26b2df315c1126653bc8f330bc1c824cfcca7de4efcabbe444fb96f0ec46542bdcf1a8ccb8f67
+DIST garcon-0.7.3.tar.bz2 543598 BLAKE2B d89377946616b955098bb4a6898288ca9c4a4995e737e5a56eee3b1fcfcb0a67061771505f0174b343a68054443a00476df38e5bf643d41bb5f4189a9fef1986 SHA512 a648bac5c2b0b3d41592eb953f800f0eaf4c47cbeb3d9c1f532243182ca1d8e9d856e92ff5abbe01224b060b8ec7bb55983d64cfd8e42e9373f3911dc157fd37
diff --git a/xfce-base/garcon/garcon-0.7.3.ebuild b/xfce-base/garcon/garcon-0.7.3.ebuild
new file mode 100644
index 000000000000..6433ea9ccb51
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.7.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="introspection"
+
+RDEPEND=">=dev-libs/glib-2.50.0
+	>=x11-libs/gtk+-3.20:3
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/libxfce4ui-4.15.7:=[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	introspection? ( dev-libs/gobject-introspection )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 7ae4e520ae39..2314b6bcc76f 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -3,3 +3,4 @@ DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f
 DIST libxfce4ui-4.15.4.tar.bz2 825895 BLAKE2B 46687dea72d17a3693c31f69bd4d1961397bf00d9395935778c8c5b90e6e56585fa2e64fe4be817ad44994841218d7cce98ade033914c56ea82a04ae7e1b70e7 SHA512 af2545f6d72df1a13d926a52b5124c52f34fbee0b2db6664292f74bcc3d93cb42263eab57beb9f882be42b6530649b2c7e42d496817f1b34b7d2b67b29e6deb1
 DIST libxfce4ui-4.15.5.tar.bz2 813220 BLAKE2B 5925ea1e25abf485e04902b47da6e09d228297b7137dbeedb8c60655e2005ded37138d12482f8321928994f2bfb8d351bb18f2eb47f288d810f58ce75e378c06 SHA512 daa666826e2b4d876025a3c93b6caf40b063b456660116f5c4c8b2beb9a9eb26d6228785cc7e6435d2a38b68c15261fc872a8cf3e03af0969342e3396a6b2a49
 DIST libxfce4ui-4.15.6.tar.bz2 823475 BLAKE2B 11193a72be188dc205ad24d7ea06ac21f93679d58bed273d78ff04180226eab14fd211bd2feba9b3ade20539364f90229bdfe226c2b1e4b6f6a17f7444feb26d SHA512 608daf350b8fb43ae4eb70b6d7e684528bcc90360f6d29b182da4f04bc51f5c191e27369dfa1554b6840dbdefbe132cfc66935b6f2d88dcc62f67f929b9423ec
+DIST libxfce4ui-4.15.7.tar.bz2 807676 BLAKE2B 0280d0e35244740d016fc4cd8afebb5a70348226011473117c3b7124abcc597baf8015754bb8aaa2fa3f0560d1a98d68f319c5b5870e1c8f5543c0a9458eb541 SHA512 0fd05bbaa42d3f3a0df552fb7419ebc390e6292f4bae58d4c9d6137421cdd55f17756e51c3adcd5ad6e7c92f277b9485ea1d791ef1295ac3d65d86201fc33a6a
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild
new file mode 100644
index 000000000000..5ec78d67a32b
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade introspection startup-notification system-info vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/xfconf-4.12:=
+	glade? ( dev-util/glade:3.10 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	startup-notification? ( x11-libs/startup-notification )
+	system-info? (
+		dev-libs/libgudev
+		gnome-base/libgtop
+		>=media-libs/libepoxy-1.2
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable system-info glibtop)
+		$(use_enable system-info epoxy)
+		$(use_enable system-info gudev)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable glade gladeui2)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}