diff --git a/Manifest.files.gz b/Manifest.files.gz
index ad8a4f2a476b..97e813250ae1 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 25f0fe60e9d3..284ae01ec87d 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
index 69417dd72479..6e1a527d5821 100644
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 7ace94cc2ebe..4d03c4b664a2 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
+	<pkgmetadata>
+		<maintainer type="person">
+			<email>zlogene@gentoo.org</email>
+			<name>Mikle Kolyada</name>
+		</maintainer>
 	<longdescription lang="en">
 		Logrotate allows for the automatic rotation compression, removal
 		and mailing of log files. Logrotate can be set to handle a log
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 709d97f97179..590549acf470 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
index 098c31662b07..04421d6524ee 100644
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@@ -1,2 +1,3 @@
+DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0
 DIST borgbackup-1.1.8.tar.gz 3456058 BLAKE2B cad55216f92025418e1a427f4b578d6b7eafa03f6b3e9c4fccb148dd3856c4f6649928fb4227249c534add125f9b3a2a0b6ed808ae12c5e60a28f9df4fb0031a SHA512 1455e68bcedab8f35f9426dc73958c6a6565ad1f1cc274ce59d34a12e3a7bfa1d12fa2b8e8dd3e71824e1cd0927babf79f4e99d4e516454ed12dbd3970d0e921
 DIST borgbackup-1.1.9.tar.gz 3468259 BLAKE2B 91c89304cf22328a0bd74583c22370343915209a204f52c65290dbec0cb688392c2e80b946a55317f8c58ef23099e710c16a34c6bfbbfb547a3e4b38c3c81c37 SHA512 466288258700fb0b3dae936c79fd423d26bea2d721dd70112b3cfd0f8e2bb335144a00de76743c31d336f6c19793775260d154326ec70d6d6d0a4e5ad6a59e59
diff --git a/app-backup/borgbackup/borgbackup-1.1.10.ebuild b/app-backup/borgbackup/borgbackup-1.1.10.ebuild
new file mode 100644
index 000000000000..0afaf4e45937
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.1.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
+HOMEPAGE="https://borgbackup.readthedocs.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl"
+
+# Unfortunately we have a file conflict with app-office/borg, bug #580402
+RDEPEND="
+	!!app-office/borg
+	app-arch/lz4
+	virtual/acl
+	dev-python/llfuse[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	${RDEPEND}
+"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/app-backup/borgbackup/borgbackup-1.1.9.ebuild b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
index 388d1d46920f..0afaf4e45937 100644
--- a/app-backup/borgbackup/borgbackup-1.1.9.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	app-arch/lz4
 	virtual/acl
 	dev-python/llfuse[${PYTHON_USEDEP}]
-	=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 29a20b4900b6..8297ce0bada2 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,4 +1,4 @@
 DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847
 DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69
-DIST dar-2.6.1.tar.gz 2098547 BLAKE2B 6c1fe1670cf46faefe04544f3d7fce0dc819e24a493c6bc903465a11e4b25a9642faf68a0bb66a2c6a92bba2782f24c5694b14571ff2c205f7954941f14aca63 SHA512 492c9ce6d7928271e5b7f263773b2129c7a237ca192cd40698848d3bcf212224c76d29c3e33ff5a8642594697f5bba660f5e97d1c7529a5794e078f2de0716e9
 DIST dar-2.6.2.tar.gz 2100192 BLAKE2B 1eb2f92e5162070a75182741f850e79932593f68fd1f31a4a1d19af77c6f86df0c8e5b995b5ccd265f051891827bfa89bf71832cb7ce6f97d9ab70e768c867b4 SHA512 88f128f99a3fe22866056e2fc881276c13731004e40437f9e2c363c4e24f603ab5b9fe7126e4f950526ccfc1b6f86fe1a4494036e83e1faf9a647ce239293ea4
+DIST dar-2.6.3.tar.gz 2110304 BLAKE2B 638bf949066c7c59e139f7a4d54d427dd86eb7d254f0cfff3cc977d75abb17d1c69d37018c46a9fab9be38193e758fd70d1598c32a98bb6f0006f97c356a4ff6 SHA512 3e3e1fa92a6954ac745dce9ecd4e82589bde562760f6cd5402fae9250f84e2df4784672ae9b0c4fa0e0baf5b2b642a025fa694a5975a5346e890655b65d93783
diff --git a/app-backup/dar/dar-2.6.1.ebuild b/app-backup/dar/dar-2.6.3.ebuild
similarity index 98%
rename from app-backup/dar/dar-2.6.1.ebuild
rename to app-backup/dar/dar-2.6.3.ebuild
index f84ffdbd95af..b348f760a97d 100644
--- a/app-backup/dar/dar-2.6.1.ebuild
+++ b/app-backup/dar/dar-2.6.3.ebuild
@@ -43,11 +43,14 @@ DEPEND="${RDEPEND}
 		lzo? ( dev-libs/lzo[static-libs] )
 		xattr? ( sys-apps/attr[static-libs] )
 	)
+"
+BDEPEND="
 	nls? (
 		sys-devel/gettext
 		virtual/libintl
 	)
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+"
 
 REQUIRED_USE="?? ( dar32 dar64 )
 		gpg? ( gcrypt )"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 39828a20f85b..a98aa4b4c4e9 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 7f048ccdf775..16e4fa97abdf 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,2 +1,3 @@
 DIST bonnie++-1.97.2.tgz 102533 BLAKE2B 019182c08b9ff7ba60e421f94039c09d27855f9e5b313f451721afdaedc9dc694b468bb30e78a04b655ec9a358ace3d68b13fc8f4d80ca3c48e0ff9387525b57 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170
 DIST bonnie++-1.97.3.tgz 100166 BLAKE2B 30feca43a2ec37b795168d37bb941241777718222d7e0681dc85a34f8691e76b4306850e41dc6bbfb3f0ad34123ecd1c12396efea99e2ade12206aa6e78708e8 SHA512 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
+DIST bonnie++-1.98.tgz 100339 BLAKE2B 2a75cbeb881fd12727b5edf4e67789e64bd624b1885cdaf83fe3fc920fb2346e98faea2d9ce5da6fac8a84318a9cbda013afa2c9809892b23d3cf85c5a70982b SHA512 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
diff --git a/app-benchmarks/bonnie++/bonnie++-1.98.ebuild b/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
new file mode 100644
index 000000000000..3a228eca434e
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.98.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="https://www.coker.com.au/bonnie++/"
+SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${PN}-1.97-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9403c14caddc..bec0a607fe82 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 25f9d574cd2e..f0c83cd810ee 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 1e0869979120..460fd730a7be 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test +vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index b20bcb3cd1fb..6b4876f46a40 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libvirt/libvirt-4.9.0.ebuild b/app-emulation/libvirt/libvirt-4.9.0.ebuild
index 608eaa29daec..1e923491c2bd 100644
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@@ -14,12 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS="amd64 x86"
 	SLOT="0"
 else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	fi
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm64 x86"
 	SLOT="0/${PV}"
 fi
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 1d550c9818ac..c43ba47b2591 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -14,12 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS="amd64"
 	SLOT="0"
 else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	fi
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index b6a78ebc5061..4c2cd8eebffb 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -14,12 +14,7 @@ if [[ ${PV} = *9999* ]]; then
 	KEYWORDS=""
 	SLOT="0"
 else
-	# Versions with 4 numbers are stable updates:
-	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
-		SRC_URI="https://libvirt.org/sources/stable_updates/${P}.tar.xz"
-	else
-		SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	fi
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi
diff --git a/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch b/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch
new file mode 100644
index 000000000000..2778cc8f4f2e
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.0.0-fix_infiniband_include.patch
@@ -0,0 +1,12 @@
+diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c
+index d1660b64..86715bfd 100644
+--- a/hw/rdma/rdma_backend.c
++++ b/hw/rdma/rdma_backend.c
+@@ -21,7 +21,6 @@
+ #include "qapi/qapi-events-rdma.h"
+ 
+ #include <infiniband/verbs.h>
+-#include <infiniband/umad_types.h>
+ #include <infiniband/umad.h>
+ #include <rdma/rdma_user_cm.h>
+ 
diff --git a/app-emulation/qemu/qemu-4.0.0-r3.ebuild b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
index 044b7f0286c0..7337923de084 100644
--- a/app-emulation/qemu/qemu-4.0.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r3.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
@@ -207,6 +207,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-sanitize-interp_info.patch
 	"${FILESDIR}"/${PN}-3.1.0-md-clear-md-no.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+	"${FILESDIR}"/${PN}-4.0.0-fix_infiniband_include.patch #686412
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0eccee5d2fa0..3e7962a76402 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	+fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
 	pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
@@ -206,6 +206,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+	"${FILESDIR}"/${PN}-4.0.0-fix_infiniband_include.patch #686412
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 773a5c591005..7835f463009a 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -12,4 +12,5 @@ DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e2253488
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
+DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
diff --git a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
similarity index 98%
rename from app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
rename to app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
index ea900713a631..ccd98499ae3e 100644
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0-r3.ebuild
@@ -20,7 +20,7 @@ else
 	UPSTREAM_VER=0
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
-	GENTOO_VER=17
+	GENTOO_VER=18
 	# xen-tools's gentoo patches version which apply to this specific ebuild
 	GENTOO_GPV=0
 	# xen-tools ovmf's patches
@@ -250,6 +250,9 @@ src_prepare() {
 	# ipxe
 	if use ipxe; then
 		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+		cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
+			tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
+		echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || die
 	fi
 
 	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 2ebbaa98987b..98d8cb77bdaf 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
index ee5d2f4da128..b83b18f53cb2 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index 5f554d3672a5..c8a4dd136e30 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 RDEPEND=">=app-admin/eselect-1.4.13"
 
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 8456de7bbc8a..dde2de2a5ffd 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/prometheus/prometheus-2.9.2.ebuild b/app-metrics/prometheus/prometheus-2.9.2.ebuild
index 59bbd678238a..8b6174ce2b4e 100644
--- a/app-metrics/prometheus/prometheus-2.9.2.ebuild
+++ b/app-metrics/prometheus/prometheus-2.9.2.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/prometheus"
 MY_PV=v${PV/_rc/-rc.}
 PROMETHEUS_COMMIT="d3245f1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus monitoring system and time series database"
 HOMEPAGE="https://github.com/prometheus/prometheus"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 201aa1d2a125..63a96b2dc046 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index ec4cdcdc95dd..0d9c96fb366a 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
index dba580029f06..ccb19502b272 100644
--- a/app-misc/goobook/Manifest
+++ b/app-misc/goobook/Manifest
@@ -1 +1,2 @@
 DIST goobook-1.9.tar.gz 29274 BLAKE2B 1c2b0b04a7bd21135395d9c3965095973d6a67a9ecb1a6bbe948864eb8bd0e4ed86197de6f5545ce112cc8538abb5ab9fb773b72b569bc9f16c67dcbcd432d5e SHA512 66d017bfa0fcad39d24b80e454d4d2e97f92a95f6dbf545739b89721b8c44702177a7f656d9cf1f38ac8278f235935afe666047cbfb64733f8deae6838f91d81
+DIST goobook-3.3.tar.gz 34964 BLAKE2B f57a0252467220e734b95714c4086bdf233902dbd93fe9259504a2aee5d8f6c51775d0aa94574defd37dd80673e1483c46eef52154f4f99f20fa6abd1f7545ac SHA512 3921d25b55b35dc18944f8ed700e0f23ab1ad51131a4b98469b0b6a1688ddd79d31c16b36600b4f7b003be64964b3c2c78a257b28805b26ae697bf405d77c409
diff --git a/app-misc/goobook/goobook-3.3.ebuild b/app-misc/goobook/goobook-3.3.ebuild
new file mode 100644
index 000000000000..214c67fd4524
--- /dev/null
+++ b/app-misc/goobook/goobook-3.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Access your Google contacts from the command line"
+HOMEPAGE="https://gitlab.com/goobook/goobook"
+SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}]"
+# dev-python/{simplejson,oauth2client} are deps for the above
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+To setup initial authentication, execute:
+
+~ $ goobook authenticate
+
+If you want to use goobook from mutt, add this in your .muttrc file:
+	set query_command=\"goobook query '%s'\"
+to query address book.
+
+You may find more information and advanced configuration tips at
+https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index df79387b9d9e..7502096e1290 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">goobook</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <name>Kalin KOZHUHAROV</name>
+    <email>kalin@thinrope.net</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">goobook</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 01744d3e1dcc..2c743f31e225 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/gnucash-3.3-r1.ebuild b/app-office/gnucash/gnucash-3.3-r1.ebuild
index 982eb4a96333..89dcc50498b5 100644
--- a/app-office/gnucash/gnucash-3.3-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -109,6 +109,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.3.ebuild b/app-office/gnucash/gnucash-3.3.ebuild
index cdbe0c78c640..6d5c46b0c02e 100644
--- a/app-office/gnucash/gnucash-3.3.ebuild
+++ b/app-office/gnucash/gnucash-3.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -107,6 +107,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.4.ebuild b/app-office/gnucash/gnucash-3.4.ebuild
index 85fac5c295af..b7de02ad0aa0 100644
--- a/app-office/gnucash/gnucash-3.4.ebuild
+++ b/app-office/gnucash/gnucash-3.4.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -120,6 +120,8 @@ src_configure() {
 		-DWITH_GNUCASH=$(usex gui)
 	)
 
+	append-cflags -Wno-error
+	append-cxxflags -Wno-error
 	cmake-utils_src_configure
 }
 
diff --git a/app-office/gnucash/gnucash-3.5.ebuild b/app-office/gnucash/gnucash-3.5.ebuild
index ca794fbd46ee..e7521d2945db 100644
--- a/app-office/gnucash/gnucash-3.5.ebuild
+++ b/app-office/gnucash/gnucash-3.5.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 GV="1.8.0"
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 65e3ff5f98dd..bc3fca3153c8 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -1,4 +1,3 @@
 DIST homebank-5.1.3.tar.gz 2686661 BLAKE2B bd43e3bc2d5d2c42e80cfc32b2beaa923b7c9110a71a703e52d45f302d16c5d8582cbb1c8463d4457b578844c357a20e7aed67c71a11d1baabf6dfec54960d3f SHA512 c95ac2871c3219d734aeb35d11e1e678efc50e166e2f8c1f05971fd341ac1598d6d672bd4b7cd7bcc206443af5305c9e1eb0557c3fcaab1ea35f4950acdef103
-DIST homebank-5.1.8.tar.gz 2745061 BLAKE2B b2e95a65f0d352fe167aa589683f3053d6b623f0240c348ea8c08f02f66b308b84873494eb7c307bbde15be28d7feb71ef966d0ae1bbb4d2cc5d22e53a68de08 SHA512 24c02b30878b920fdf8ee190fd8cfcdead1ecb971495880db8a49ca771f4cd140a2c1ff4eb09f3e6770be694480b84c5ff3b0d49568ce81c86e83b95797dbed4
 DIST homebank-5.2.2.tar.gz 2601784 BLAKE2B e0a66cebbdc9247aeba9946c4adf5b6677abb49cd93d212fc8008c44c53a21966ee4fa1291f887196fe3168de992a892d54fe82aec228a88f613b45358076dd2 SHA512 83ccf7f96b1eb9f2e5c134b151dce53790092e2ecb06f5e6a5e50057d6a32cde6cf45b9e98c07a81e7f224d33dae5d98e4693e57c413df675f63d21b418525b0
 DIST homebank-5.2.3.tar.gz 2665397 BLAKE2B d197a113b1387c414ba8d11ebe012d0887dbfb1d9eb20c61197e0ddcf87da64e09b2bff108c07b350a1326f8b935fb4c8d56f14240e9815df5b021ab75a3f7dc SHA512 7b6530aa609ea047a19aadb65e459406226cc94d07a5a44e7ba06535cafcfe52e8b2471644b2bffbeb20cd699167858d2787ebdbc45166e4c7720fbff717b3de
diff --git a/app-office/homebank/homebank-5.1.8.ebuild b/app-office/homebank/homebank-5.1.8.ebuild
deleted file mode 100644
index 17236ea7d31d..000000000000
--- a/app-office/homebank/homebank-5.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit xdg-utils gnome2-utils
-
-DESCRIPTION="Free, easy, personal accounting for everyone"
-HOMEPAGE="http://homebank.free.fr/index.php"
-SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.39
-	>=net-libs/libsoup-2.26
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.8.3 )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.8.1
-	dev-perl/XML-Parser
-	>=dev-util/intltool-0.40.5
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	econf $(use_with ofx)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fc5f8a4bc84f..54486c405748 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
new file mode 100644
index 000000000000..236ff9976fbf
--- /dev/null
+++ b/app-portage/elicense/Manifest
@@ -0,0 +1 @@
+DIST elicense-1.0.1.tar.gz 9260 BLAKE2B b5782412de613bce009ff1d685de6af9a129afadd131a91328cfd02d55c416e5c7549aacf676c4596a4512de4e3a42d2b89c24d2367404177e9675a7fdc35d94 SHA512 3b7b412742a9b67b5c4dda10838d6380c1f18199bcaa87458f30b06bff068228f64364d336d1daf4b95df6c1889ae9de7f277dea3defd18dbf74d50fc9381500
diff --git a/app-portage/elicense/elicense-1.0.1.ebuild b/app-portage/elicense/elicense-1.0.1.ebuild
new file mode 100644
index 000000000000..bbba9eea7ef6
--- /dev/null
+++ b/app-portage/elicense/elicense-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
+HOMEPAGE="https://github.com/Whissi/elicense"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/elicense/elicense-9999.ebuild b/app-portage/elicense/elicense-9999.ebuild
new file mode 100644
index 000000000000..bbba9eea7ef6
--- /dev/null
+++ b/app-portage/elicense/elicense-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
+HOMEPAGE="https://github.com/Whissi/elicense"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/elicense/metadata.xml b/app-portage/elicense/metadata.xml
new file mode 100644
index 000000000000..a100a0b4e8f7
--- /dev/null
+++ b/app-portage/elicense/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>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">Whissi/elicense</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
similarity index 91%
rename from app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
rename to app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index 92d8fee57299..184ac4d49c79 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 36964fd86606..d93b586c58dd 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 git-r3 prefix
diff --git a/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
new file mode 100644
index 000000000000..0b61ff486871
--- /dev/null
+++ b/app-portage/prefix-toolkit/prefix-toolkit-1.ebuild
@@ -0,0 +1,567 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utilities for users of Gentoo Prefix"
+HOMEPAGE="https://prefix.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-3"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] ||
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+BDEPEND="
+	>sys-apps/portage-2.3.62
+"
+DEPEND=""
+RDEPEND="
+	!app-portage/prefix-chain-setup
+	!sys-apps/prefix-chain-utils
+	prefix-stack? (
+		>=sys-apps/baselayout-prefix-2.6
+	)
+"
+
+S="${WORKDIR}"
+
+my_unpack() {
+	local infile=$1
+	local outfile=${2:-${infile}}
+	ebegin "extracting ${outfile}"
+	sed -ne "/^: ${infile} /,/EOIN/{/EOIN/d;p}" "${EBUILD}" \
+		> "${outfile}" || die "Failed to unpack ${outfile}"
+	eend $?
+}
+
+src_unpack() {
+	if use prefix-stack ; then
+		my_unpack prefix-stack.bash_login
+		my_unpack prefix-stack.bashrc
+		my_unpack prefix-stack.envd.99stack
+		my_unpack prefix-stack-ccwrap
+		local editor pager
+		for editor in "${EDITOR}" {"${EPREFIX}","${BROOT}"}/bin/nano
+		do
+			[[ -x ${editor} ]] || continue
+		done
+		for pager in "${PAGER}" {"${EPREFIX}","${BROOT}"}/usr/bin/less
+		do
+			[[ -x ${pager} ]] || continue
+		done
+		printf '%s\n' "EDITOR=\"${editor}\"" "PAGER=\"${pager}\"" > 000fallback
+	else
+		my_unpack prefix-stack-setup
+	fi
+	my_unpack startprefix
+}
+
+my_prefixify() {
+	local ebash eenv
+	if use prefix-stack ; then
+		ebash="${BROOT}/bin/bash"
+		eenv="${BROOT}/usr/bin/env"
+	else
+		ebash="${EPREFIX}/bin/bash"
+		eenv="${EPREFIX}/usr/bin/env"
+	fi
+
+	# the @=@ prevents repoman from believing we set readonly vars
+	sed -e "s,@GENTOO_PORTAGE_BPREFIX@,${BROOT},g" \
+		-e "s,@GENTOO_PORTAGE_EPREFIX@,${EPREFIX},g" \
+		-e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" \
+		-e "s,@GENTOO_PORTAGE_EBASH@,${ebash},g" \
+		-e "s,@GENTOO_PORTAGE_EENV@,${eenv},g" \
+		-e "s,@=@,=,g" \
+		-i "$@" || die
+}
+
+src_configure() {
+	# do not eprefixify during unpack, to allow userpatches to apply
+	my_prefixify *
+}
+
+src_install-prefix-stack-ccwrap() {
+	# install toolchain wrapper.
+	local wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-${PN}/${PV}
+	local wrappercfg=${CHOST}-${P}
+
+	exeinto $wrapperdir
+	doexe prefix-stack-ccwrap
+
+	local cc
+	for cc in \
+		gcc \
+		g++ \
+		cpp \
+		c++ \
+		windres \
+	; do
+		dosym prefix-stack-ccwrap $wrapperdir/${CHOST}-${cc}
+		dosym ${CHOST}-${cc} $wrapperdir/${cc}
+	done
+
+	# LDPATH is required to keep gcc-config happy :(
+	cat > ./${wrappercfg} <<-EOF
+		GCC_PATH="${EPREFIX}$wrapperdir"
+		LDPATH="${EPREFIX}$wrapperdir"
+		EOF
+
+	insinto /etc/env.d/gcc
+	doins ./${wrappercfg}
+}
+
+src_install() {
+	if use prefix-stack; then
+		src_install-prefix-stack-ccwrap
+		insinto /etc
+		doins prefix-stack.bash_login
+		insinto /etc/bash
+		newins prefix-stack.bashrc bashrc
+		newenvd prefix-stack.envd.99stack 99stack
+		doenvd 000fallback
+	else
+		dobin prefix-stack-setup
+	fi
+	exeinto /
+	doexe startprefix
+}
+
+return 0
+
+: startprefix <<'EOIN'
+#!@GENTOO_PORTAGE_EBASH@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> -- 2007-03-10
+# Enters the prefix environment by starting a login shell from the
+# prefix.  The SHELL environment variable is elevated in order to make
+# applications that start login shells to work, such as `screen`.
+
+# if you come from a substantially polluted environment (another
+# Prefix), a cleanup as follows resolves most oddities I've ever seen:
+# env -i HOME=$HOME TERM=$TERM USER=$USER $SHELL -l
+# hence this script starts the Prefix shell like this
+
+if [[ ${SHELL#@GENTOO_PORTAGE_EPREFIX@} != ${SHELL} ]]
+then
+	echo "You appear to be in prefix already (SHELL=${SHELL})" > /dev/stderr
+	exit -1
+elif [[ ${SHELL#@GENTOO_PORTAGE_BPREFIX@} != ${SHELL} ]] &&
+	 [[ ${EPREFIX-unset} == '@GENTOO_PORTAGE_EPREFIX@' ]]
+then
+	echo "You appear to be in stacked prefix already (EPREFIX=${EPREFIX})" > /dev/stderr
+	exit -1
+fi
+
+# What is our prefix?
+EPREFIX@=@'@GENTOO_PORTAGE_EPREFIX@'
+BPREFIX@=@'@GENTOO_PORTAGE_BPREFIX@'
+
+# not all systems have the same location for shells, however what it
+# boils down to, is that we need to know what the shell is, and then we
+# can find it in the bin dir of our prefix
+for SHELL in \
+	"${EPREFIX}/bin/${SHELL##*/}" \
+	"${BPREFIX}/bin/${SHELL##*/}" \
+	${SHELL##*/}
+do
+	[[ ${SHELL} == */* && -x ${SHELL} ]] && break
+done
+
+# check if the shell exists
+if [[ ${SHELL} != */* ]]
+then
+	echo "Failed to find the Prefix shell, this is probably" > /dev/stderr
+	echo "because you didn't emerge the shell ${SHELL}" > /dev/stderr
+	exit 1
+fi
+
+# set the prefix shell in the environment
+export SHELL
+
+# give a small notice
+echo "Entering Gentoo Prefix ${EPREFIX}"
+# start the login shell, clean the entire environment but what's needed
+RETAIN="HOME=$HOME TERM=$TERM USER=$USER SHELL=$SHELL"
+# PROFILEREAD is necessary on SUSE not to wipe the env on shell start
+[[ -n ${PROFILEREAD} ]] && RETAIN+=" PROFILEREAD=$PROFILEREAD"
+# ssh-agent is handy to keep, of if set, inherit it
+[[ -n ${SSH_AUTH_SOCK} ]] && RETAIN+=" SSH_AUTH_SOCK=$SSH_AUTH_SOCK"
+# if we're on some X terminal, makes sense to inherit that too
+[[ -n ${DISPLAY} ]] && RETAIN+=" DISPLAY=$DISPLAY"
+# do it!
+if [[ ${SHELL#${EPREFIX}} != ${SHELL} ]] ; then
+	'@GENTOO_PORTAGE_EENV@' -i $RETAIN $SHELL -l
+elif [[ ' bash ' == *" ${SHELL##*/} "* ]] ; then
+	# shell coming from different prefix would load it's own
+	# etc/profile upon -l, so we have to override
+	'@GENTOO_PORTAGE_EENV@' -i ${RETAIN} "${SHELL}" --rcfile "${EPREFIX}"/etc/prefix-stack.bash_login -i
+else
+	echo "Only bash is supported with stacked Prefix (you have ${SHELL##*/}), sorry!" > /dev/stderr
+	exit 1
+fi
+# and leave a message when we exit... the shell might return non-zero
+# without having real problems, so don't send alarming messages about
+# that
+echo "Leaving Gentoo Prefix with exit status $?"
+EOIN
+
+: prefix-stack.bashrc <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, yet
+# etc/bash/bashrc from base Prefix still is useful.
+#
+
+if [[ $- != *i* ]] ; then
+	# Shell is non-interactive, bashrc does not apply
+	return
+fi
+
+if [[ -r @GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc ]] ; then
+	source '@GENTOO_PORTAGE_BPREFIX@/etc/bash/bashrc'
+	# only if base Prefix does have an etc/bash/bashrc, we also
+	# run bashrc snippets provided by packages in stacked Prefix
+	for sh in '@GENTOO_PORTAGE_EPREFIX@'/etc/bash/bashrc.d/* ; do
+		[[ -r ${sh} ]] && source "${sh}"
+	done
+	unset sh
+else
+	# etc/profile does expect etc/bash/bashrc to set PS1
+	PS1='\u@\h \w \$ '
+fi
+EOIN
+
+: prefix-stack.bash_login <<'EOIN'
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# In stacked Prefix there is no bash installed, so there is
+# no bash able to load this Prefix' profile as login shell.
+# Instead, you can specify this one as bash rcfile to mimic
+# a bash login shell using this stacked Prefix profile.
+#
+
+if [[ -s '@GENTOO_PORTAGE_EPREFIX@/etc/profile' ]] ; then
+	. '@GENTOO_PORTAGE_EPREFIX@/etc/profile'
+fi
+if [[ -s ~/.bash_profile ]] ; then
+	. ~/.bash_profile
+elif [[ -s ~/.bash_login ]] ; then
+	. ~/.bash_login
+elif [[ -s ~/.profile ]] ; then
+	. ~/.profile
+fi
+EOIN
+
+: prefix-stack.envd.99stack <<'EOIN'
+PKG_CONFIG_PATH@=@"@GENTOO_PORTAGE_EPREFIX@/usr/lib/pkgconfig:@GENTOO_PORTAGE_EPREFIX@/usr/share/pkgconfig"
+PORTAGE_CONFIGROOT@=@"@GENTOO_PORTAGE_EPREFIX@"
+EPREFIX@=@"@GENTOO_PORTAGE_EPREFIX@"
+EOIN
+
+: prefix-stack-setup <<'EOIN'
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PARENT_EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+PARENT_CHOST="@GENTOO_PORTAGE_CHOST@"
+CHILD_EPREFIX=
+CHILD_PROFILE=
+
+#
+# get ourselfs the functions.sh script for ebegin/eend/etc.
+#
+for f in \
+	/lib/gentoo/functions.sh \
+	/etc/init.d/functions.sh \
+	/sbin/functions.sh \
+; do
+	if [[ -r ${PARENT_EPREFIX}${f} ]] ; then
+		. "${PARENT_EPREFIX}${f}"
+		f=found
+		break
+	fi
+done
+
+if [[ ${f} != found ]] ; then
+	echo "Cannot find Gentoo functions, aborting." >&2
+	exit 1
+fi
+
+for arg in "$@"; do
+	case "${arg}" in
+	--eprefix=*)	CHILD_EPREFIX="${arg#--eprefix=}"	;;
+	--profile=*)	CHILD_PROFILE="${arg#--profile=}"	;;
+
+	--help)
+		einfo "$0 usage:"
+		einfo "  --eprefix=[PATH]       Path to new EPREFIX to create stacked to the prefix"
+		einfo "                         where this script is installed (${PARENT_EPREFIX})"
+		einfo "  --profile=[PATH]       The absolute path to the profile to use. This path"
+		einfo "                         must point to a directory within ${PARENT_EPREFIX}"
+		exit 0
+		;;
+	esac
+done
+
+#
+# sanity check of given values
+#
+
+test -n "${CHILD_EPREFIX}" || { eerror "no eprefix argument given"; exit 1; }
+test -d "${CHILD_EPREFIX}" && { eerror "${CHILD_EPREFIX} already exists"; exit 1; }
+test -n "${CHILD_PROFILE}" || { eerror "no profile argument given"; exit 1; }
+test -d "${CHILD_PROFILE}" || { eerror "${CHILD_PROFILE} does not exist"; exit 1; }
+
+einfo "creating stacked prefix ${CHILD_EPREFIX}"
+
+#
+# functions needed below.
+#
+eend_exit() {
+	eend $1
+	[[ $1 != 0 ]] && exit 1
+}
+
+#
+# create the directories required to bootstrap the least.
+#
+ebegin "creating directory structure"
+(
+	set -e
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.mask
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/profile/use.force
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/env
+	mkdir -p "${CHILD_EPREFIX}"/etc/portage/package.env
+	ln -s "${PARENT_EPREFIX}"/etc/portage/repos.conf "${CHILD_EPREFIX}"/etc/portage/repos.conf
+)
+eend_exit $?
+
+#
+# create a make.conf and set PORTDIR and PORTAGE_TMPDIR
+#
+ebegin "creating make.conf"
+(
+	set -e
+	echo "#"
+	echo "# The following values where taken from the parent prefix's"
+	echo "# environment. Feel free to adopt them as you like."
+	echo "#"
+	echo "CFLAGS=\"$(portageq envvar CFLAGS)\""
+	echo "CXXFLAGS=\"$(portageq envvar CXXFLAGS)\""
+	echo "MAKEOPTS=\"$(portageq envvar MAKEOPTS)\""
+	niceness=$(portageq envvar PORTAGE_NICENESS || true)
+	[[ -n ${niceness} ]] &&
+		echo "PORTAGE_NICENESS=\"${niceness}\""
+	echo
+	echo "# Mirrors from parent prefix."
+	echo "GENTOO_MIRRORS=\"$(portageq envvar GENTOO_MIRRORS || true)\""
+	echo
+	echo "# Below comes the prefix-stack setup. Only change things"
+	echo "# if you know exactly what you are doing!"
+	echo "EPREFIX=\"${CHILD_EPREFIX}\""
+	echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\""
+	echo "BROOT=\"${PARENT_EPREFIX}\""
+) > "${CHILD_EPREFIX}"/etc/portage/make.conf
+eend_exit $?
+
+ebegin "creating use.mask/prefix-stack"
+printf -- '-%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.mask/prefix-stack
+eend_exit $?
+
+ebegin "creating use.force/prefix-stack"
+printf -- '%s\n' prefix{,-guest,-stack} > "${CHILD_EPREFIX}"/etc/portage/profile/use.force/prefix-stack
+eend_exit $?
+
+ebegin "creating env/host-cc.conf"
+cat > "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf <<-EOM
+	CC=${PARENT_CHOST}-gcc
+	CXX=${PARENT_CHOST}-g++
+	EOM
+eend_exit $?
+
+ebegin "creating package.env/prefix-stack"
+cat > "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack <<-'EOM'
+	# merge with the parent's chost. this forces the use of the parent
+	# compiler, which generally would be illegal - this is an exception.
+	# This is required for example on winnt, because the wrapper has to
+	# be able to use/resolve symlinks, etc. native winnt binaries miss
+	# that ability, but cygwin binaries don't.
+	sys-devel/gcc-config host-cc.conf
+	sys-apps/gentoo-functions host-cc.conf
+	EOM
+eend_exit $?
+
+#
+# create the make.profile symlinks.
+#
+ebegin "creating make.profile"
+(
+	ln -s "${CHILD_PROFILE}" "${CHILD_EPREFIX}/etc/portage/make.profile"
+)
+eend_exit $?
+
+#
+# adjust permissions of generated files.
+#
+ebegin "adjusting permissions"
+(
+	set -e
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/make.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/env/host-cc.conf
+	chmod 644 "${CHILD_EPREFIX}"/etc/portage/package.env/prefix-stack
+)
+eend_exit $?
+
+#
+# now merge some basics.
+#
+ebegin "installing required basic packages"
+(
+	set -e
+	export PORTAGE_CONFIGROOT@=@"${CHILD_EPREFIX}"
+	export EPREFIX@=@"${CHILD_EPREFIX}"
+	export PORTAGE_OVERRIDE_EPREFIX@=@"${PARENT_EPREFIX}"
+
+#	# this -pv is there to avoid the global update output, which is
+#	# there on the first emerge run. (thus, just cosmetics).
+#	emerge --pretend --oneshot --nodeps baselayout-prefix
+
+	# let baselayout create the directories
+	USE@=@"${USE} build" \
+	emerge --verbose --nodeps --oneshot \
+		'>=baselayout-prefix-2.6'
+
+	# Record the prefix-toolkit into @world file, as it provides the
+	# env.d telling the PM to manage this stacked Prefix, but may not
+	# (unlike baselayout) be part of @system set per the profile.
+	emerge --verbose --nodeps \
+		prefix-toolkit
+
+	emerge --verbose --nodeps --oneshot \
+		gentoo-functions \
+		elt-patches \
+		gnuconfig \
+		gcc-config
+
+	# select the stack wrapper profile from gcc-config
+	env -i PORTAGE_CONFIGROOT="${CHILD_EPREFIX}" "$(type -P bash)" "${CHILD_EPREFIX}"/usr/bin/gcc-config 1
+
+	# do this _after_ selecting the correct compiler!
+	emerge --verbose --nodeps --oneshot \
+		libtool
+)
+eend_exit $?
+
+#
+# wow, all ok :)
+#
+ewarn
+ewarn "all done. don't forget to tune ${CHILD_EPREFIX}/etc/portage/make.conf."
+ewarn "to enter the new prefix, run \"${CHILD_EPREFIX}/startprefix\"."
+ewarn
+EOIN
+
+: prefix-stack-ccwrap <<'EOIN'
+#!@GENTOO_PORTAGE_BPREFIX@/bin/bash
+
+if [ -r /cygdrive/. ]; then
+	winpath2unix() { cygpath -u "$1"; }
+	unixpath2win() { cygpath -w "$1"; }
+fi
+
+myself=${0##*/} # basename $0
+link_dirs=()
+opts=()
+chost="@GENTOO_PORTAGE_CHOST@"
+prefix="@GENTOO_PORTAGE_EPREFIX@"
+absprefix=${prefix}
+if [[ ${chost} == *"-winnt"* ]]; then
+	# we may get called from windows binary, like pkgdata in dev-libs/icu
+	# in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
+	absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
+fi
+[[ ${myself} == *windres* ]] && mode=compile || mode=link
+orig_args=("$@")
+
+for opt in "$@"
+do
+	case "$opt" in
+	-L)
+		link_dirs=("${link_dirs[@]}" "-L$1")
+		shift
+		;;
+	-L*)
+		link_dirs=("${link_dirs[@]}" "${opt}")
+		;;
+	*)
+		case "${opt}" in
+		-v)
+			# -v done right: only use mode version if -v is the _only_
+			# argument on the command line.
+			[[ ${#orig_args[@]} -gt 1 ]] || mode=version
+			;;
+		--version)	mode=version ;;
+		-c|-E|-S)	mode=compile ;;
+		-print-search-dirs) mode=dirs ;;
+		esac
+		opts=("${opts[@]}" "${opt}")
+		;;
+	esac
+done
+
+# remove any path to current prefix, need base prefix only
+new_path=
+save_ifs=$IFS
+IFS=':'
+for p in $PATH
+do
+	IFS=$save_ifs
+	[[ ${p#${absprefix}} != "${p}" ]] && continue
+	if [[ -z "${new_path}" ]]; then
+		new_path="${p}"
+	else
+		new_path="${new_path}:${p}"
+	fi
+done
+IFS=$save_ifs
+
+PATH=${new_path}
+
+# binutils-config's ldwrapper understands '-R' for aix and hpux too.
+# parity (winnt) understands -rpath only ...
+case "${chost}" in
+*-winnt*) rpath_opt="-Wl,-rpath," ;;
+*) rpath_opt="-Wl,-R," ;;
+esac
+
+pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
+pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
+pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
+
+# ensure we run the right chost program in base prefix
+[[ ${myself} == *-*-*-* ]] || myself=${chost}-${myself#${chost}-}
+
+case "$mode" in
+link)    exec "${myself}" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
+compile) exec "${myself}" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
+version) exec "${myself}" "${orig_args[@]}" ;;
+dirs)
+	"${myself}" "${orig_args[@]}" | while read line; do
+		if [[ "${line}" == "libraries: ="* ]]; then
+			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
+		else
+			echo "${line}"
+		fi
+	done
+	;;
+*)			echo "cannot infer ${myself}'s mode from comamnd line arguments"; exit 1 ;;
+esac
+EOIN
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f62f4fc8c4c9..1f8505f18933 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 9444428a270b..c54f1f42b139 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 88b88f79755c..e5340d3ca4e0 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 
 RDEPEND="
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 96a00b323810..ac9775dd9ed1 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
index 60f40077f3ba..894d11ac03ce 100644
--- a/app-vim/vim-go/Manifest
+++ b/app-vim/vim-go/Manifest
@@ -1,2 +1,3 @@
 DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
 DIST vim-go-1.19.tar.gz 218988 BLAKE2B 3bbafde28342b8febc8763fe9858575abc8f3e9735f3886de508cb7986bd97d1d2eeb36bdd4eb9b2f514e74f47b08355549e32c101519dac41427f302f57e29f SHA512 fc2cdcbc58878ab435c6b253a226e46ca60083bfd4e6df683e1dbeb368bb25b10fc531630a6b1f6cbfc32306a255eb6eae6bcc3f7a7b770758d4beb71c539f77
+DIST vim-go-1.20.tar.gz 232322 BLAKE2B f72664c79d781152748b6d5e48e9363a924e257eb0054931127d83fe4dc56d5b3e3592800ae3be3812609ec92c9b66fbcba8a1b1ca76891573408db14a0b2865 SHA512 1f5499dd33b72466127c1fbbd7a10dca41d9e8c3add6a0b2b3efa8dc0caf2aaa26311357a5b5eaecf2461a3465aabbf608a9ca35203139ead083bbcc806ea552
diff --git a/app-vim/vim-go/vim-go-1.20.ebuild b/app-vim/vim-go/vim-go-1.20.ebuild
new file mode 100644
index 000000000000..3a6740617589
--- /dev/null
+++ b/app-vim/vim-go/vim-go-1.20.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Go development plugin for Vim"
+HOMEPAGE="https://github.com/fatih/vim-go"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RESTRICT="test"
+
+src_compile() {
+	# safely skip `make test` triggered by `make` as it runs `go get` commands
+	# TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
+	:;
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index af03339ba1ae..0271d93e5f7b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 2c365e5f26c9..0525b98345af 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/freetds/freetds-1.00.558.ebuild b/dev-db/freetds/freetds-1.00.558.ebuild
index 5da473b6d29e..e4c90182255f 100644
--- a/dev-db/freetds/freetds-1.00.558.ebuild
+++ b/dev-db/freetds/freetds-1.00.558.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.freetds.org/pub/${PN}/current/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 
 IUSE="debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs"
 # iODBC and unixODBC are mutually-exclusive choices for
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index d024e6d0ca80..786c48382a04 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,5 +1 @@
-DIST LMDB_0.9.18.tar.gz 139156 BLAKE2B 6a8d32c6f203272a212d5e298f7d1af290c12a87680c3177521d1b10d0c42691dbdfdb3b49d467c97cf4c621ddef8e00bca0bbaa352203eeca66e8e294c0fa8b SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
-DIST LMDB_0.9.19.tar.gz 143141 BLAKE2B 69f39e2194638989d8a17b79edd7918966d5608f4e611a7446b45e7321adf3b7d4bd69107fe00a1476d32cbd43b83f512c8498cefa3fca7eea8ba615821341fe SHA512 1d9825f09592ad92a540a1dec232cf6649f41cc67b0d59dc8958a71f4090f347c84995f32a166e2c2efecb862981f455814dd07af99bc3489e42fe3fd8bc6191
-DIST LMDB_0.9.21.tar.gz 143352 BLAKE2B de206eb03ebd0ed329127380a2aeac693280d9c1d7b61a4a36c42889169b28adab30ecfeff37487b9e36f4e953bc6587e54b7a49dfd0969f2dec99e45bd09654 SHA512 e0f998507da654ccac02aa199367e8363c37f47e06ee0984085aae60fb086e49087824915bf8896f90187f1cc96e5c9caf5e5f72fa3911415151ca1e56f0309f
-DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4cafbca71446681a615884e82ae7fcdd4d8d6fdfa8e409a646115c3577972cdfcee8d792af0a1d82a8efbbd1 SHA512 49afca13b9683ed571c274380bb5e111236903b12d19bcb8781d6bbc00f711766b0d62de0b36536c85309cc9ff9e9d0aaa708e27bae9be6cfcaed8ba91e5545d
 DIST LMDB_0.9.23.tar.gz 143813 BLAKE2B 252acad974a7ed528fe0e52b8332845bc0b6076599bbc79ef2c3f41459acb6ccbe5f6030c6a258fe30633c4c0568fa05fa6d46dc05bab3f93ee3aab16e6faa89 SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120
diff --git a/dev-db/lmdb/lmdb-0.9.18.ebuild b/dev-db/lmdb/lmdb-0.9.18.ebuild
deleted file mode 100644
index 24e6c6e86d45..000000000000
--- a/dev-db/lmdb/lmdb-0.9.18.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="http://symas.com/mdb/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-# =net-nds/openldap-2.4.40 installs lmdb files.
-RDEPEND="!=net-nds/openldap-2.4.40"
-
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
-
-src_prepare() {
-	sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-		-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-		-e "s!^AR.*!AR = $(tc-getAR)!" \
-		-e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
-		-e "/^libdir/s!lib\$!$(get_libdir)!" \
-		-e "s!shared!shared -Wl,-soname,liblmdb.so.0!" \
-		"${S}/Makefile" || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	emake LDLIBS+=" -pthread"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die
-	dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
-
-	use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
-}
diff --git a/dev-db/lmdb/lmdb-0.9.19.ebuild b/dev-db/lmdb/lmdb-0.9.19.ebuild
deleted file mode 100644
index c8ac76bcd7cd..000000000000
--- a/dev-db/lmdb/lmdb-0.9.19.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="http://symas.com/mdb/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-# =net-nds/openldap-2.4.40 installs lmdb files.
-RDEPEND="!=net-nds/openldap-2.4.40"
-
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
-
-src_prepare() {
-	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
-	[[ ${CHOST} == *-darwin* ]] && \
-		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
-	sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-		-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-		-e "s!^AR.*!AR = $(tc-getAR)!" \
-		-e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
-		-e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
-		-e "/^libdir/s!lib\$!$(get_libdir)!" \
-		-e "s!shared!shared ${soname}!" \
-		"${S}/Makefile" || die
-	eapply_user
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# ensure sigwait has a second sig argument
-		append-cppflags -D_POSIX_PTHREAD_SEMANTICS
-		# fdatasync lives in -lrt on Solaris 10
-		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
-	fi
-}
-
-src_compile() {
-	emake LDLIBS+=" -pthread"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \
-		"${ED}"usr/$(get_libdir)/liblmdb$(get_libname 0) || die
-	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
-	use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
-}
diff --git a/dev-db/lmdb/lmdb-0.9.21-r1.ebuild b/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
deleted file mode 100644
index 4a0589b13fe3..000000000000
--- a/dev-db/lmdb/lmdb-0.9.21-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic multilib-minimal
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="http://symas.com/mdb/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-# =net-nds/openldap-2.4.40 installs lmdb files.
-RDEPEND="!=net-nds/openldap-2.4.40"
-
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
-
-src_prepare() {
-	eapply_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-    local soname="-Wl,-soname,liblmdb$(get_libname 0)"
-    [[ ${CHOST} == *-darwin* ]] && \
-        soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
-    sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-        -e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-        -e "s!^AR.*!AR = $(tc-getAR)!" \
-        -e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
-        -e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
-        -e "/^libdir/s!lib\$!$(get_libdir)!" \
-        -e "s!shared!shared ${soname}!" \
-        "Makefile" || die
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# ensure sigwait has a second sig argument
-		append-cppflags -D_POSIX_PTHREAD_SEMANTICS
-		# fdatasync lives in -lrt on Solaris 10
-		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
-	fi
-}
-
-multilib_src_compile() {
-	emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}"usr/$(get_libdir)/liblmdb$(get_libname) \
-		"${ED}"usr/$(get_libdir)/liblmdb$(get_libname 0) || die
-	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
-	use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
-}
diff --git a/dev-db/lmdb/lmdb-0.9.22.ebuild b/dev-db/lmdb/lmdb-0.9.22.ebuild
deleted file mode 100644
index 9e4e027f8378..000000000000
--- a/dev-db/lmdb/lmdb-0.9.22.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs flag-o-matic multilib-minimal
-
-DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
-HOMEPAGE="http://symas.com/mdb/"
-SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-# =net-nds/openldap-2.4.40 installs lmdb files.
-RDEPEND="!=net-nds/openldap-2.4.40-r0"
-
-S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
-
-src_prepare() {
-	eapply_user
-	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then
-		# posix_memalign isn't available before 10.6, but on OSX
-		# malloc is always aligned for any addressable type
-		sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die
-	fi
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local soname="-Wl,-soname,liblmdb$(get_libname 0)"
-	[[ ${CHOST} == *-darwin* ]] && \
-		soname="-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/liblmdb$(get_libname 0)"
-	sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-		-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-		-e "s!^AR.*!AR = $(tc-getAR)!" \
-		-e "s!^SOEXT.*!SOEXT = $(get_libname)!" \
-		-e "/^prefix/s!/usr/local!${EPREFIX}/usr!" \
-		-e "/^libdir/s!lib\$!$(get_libdir)!" \
-		-e "s!shared!shared ${soname}!" \
-		"Makefile" || die
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# fdatasync lives in -lrt on Solaris 10
-		[[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt
-	fi
-}
-
-multilib_src_compile() {
-	emake LDLIBS+=" -pthread"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}"/usr/$(get_libdir)/liblmdb$(get_libname) \
-		"${ED}"/usr/$(get_libdir)/liblmdb$(get_libname 0) || die
-	dosym liblmdb$(get_libname 0) /usr/$(get_libdir)/liblmdb$(get_libname)
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}/lmdb.pc"
-	sed -i -e "s!@PACKAGE_VERSION@!${PV}!" \
-		-e "s!@prefix@!${EPREFIX}/usr!g" \
-		-e "s!@libdir@!$(get_libdir)!" \
-		"${ED}"/usr/$(get_libdir)/pkgconfig/lmdb.pc
-
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/liblmdb.a || die
-}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 6fd807912543..b92e6737b276 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
index e0a8a9e30c93..769cff270388 100644
--- a/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 80b618f57baf..6c78b091e8a9 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 73d92c29acf1..144a2de505db 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,5 +2,4 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
 DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
similarity index 86%
rename from dev-java/maven-bin/maven-bin-3.0.5.ebuild
rename to dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
index c8fd2a500821..c17509652106 100644
--- a/dev-java/maven-bin/maven-bin-3.0.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.5-r1.ebuild
@@ -17,22 +17,27 @@ LICENSE="Apache-2.0"
 SLOT="3.0"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-eselect/eselect-java"
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
 RDEPEND="
-	${DEPEND}
-	>=virtual/jdk-1.5"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}"
 
 MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm -v "${S}"/bin/*.bat || die
 	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
 }
 
-# TODO we should use jars from packages, instead of what is bundled
+# TODO:
+# we should use jars from packages instead of what is bundled.
+
 src_install() {
 	dodir "${MAVEN_SHARE}"
 	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
diff --git a/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..22a30f299033
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
deleted file mode 100644
index b75f0e64b4d2..000000000000
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-	dev-java/aopalliance:1
-	dev-java/avalon-framework:4.1
-	dev-java/commons-cli:1
-	dev-java/commons-io:1
-	dev-java/javax-inject:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/juel:0
-	dev-java/osgi-core-api:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
similarity index 50%
rename from dev-java/maven-bin/maven-bin-3.3.9.ebuild
rename to dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
index 45c967a5d4e7..1c7cfabd20fb 100644
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit java-pkg-2
 
@@ -15,72 +15,21 @@ SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
 HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
-SLOT="3.3"
+SLOT="3.2"
 KEYWORDS="amd64 x86"
 
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
 DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
 
 RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
+	>=virtual/jre-1.8"
 
 S="${WORKDIR}/${MY_P}"
 
-MAVEN="${PN}-${SLOT}"
+MAVEN=${PN}-${SLOT}
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
 # TODO: We should use jars from packages, instead of what is bundled.
 src_install() {
 	dodir "${MAVEN_SHARE}"
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
deleted file mode 100644
index 74e3ef2b4a48..000000000000
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.2"
-KEYWORDS="amd64 x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-DEPEND="app-eselect/eselect-java
-|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
-dev-java/aopalliance:1
-dev-java/avalon-framework:4.1
-dev-java/commons-cli:1
-dev-java/commons-io:1
-dev-java/javax-inject:0
-dev-java/jsoup:0
-dev-java/jsr250:0
-dev-java/juel:0
-dev-java/osgi-core-api:0
-java-virtuals/interceptor-api:0
-java-virtuals/servlet-api:2.4"
-
-RDEPEND=">=virtual/jdk-1.6
->=virtual/jre-1.6
-${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v bin/*.bat lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
-	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
-	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
-	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
new file mode 100644
index 000000000000..966eaa23b60a
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.9-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.0.ebuild b/dev-java/maven-bin/maven-bin-3.6.0.ebuild
deleted file mode 100644
index a7e55b1b599d..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..46ef90466cd5
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/maven-bin/maven-bin-3.6.1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1.ebuild
deleted file mode 100644
index 4a6edff4651e..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Needs further resolution:
-#
-# - https://bugs.gentoo.org/show_bug.cgi?id=472850
-# - https://bugs.gentoo.org/show_bug.cgi?id=477436
-#
-CDEPEND="
-	dev-java/juel:0
-	dev-java/log4j:0
-	dev-java/jsoup:0
-	dev-java/jsr250:0
-	dev-java/commons-io:1
-	dev-java/aopalliance:1
-	dev-java/commons-cli:1
-	dev-java/javax-inject:0
-	dev-java/osgi-core-api:0
-	dev-java/commons-logging:0
-	java-virtuals/interceptor-api:0
-	java-virtuals/servlet-api:3.0"
-
-DEPEND="
-	${CDEPEND}
-	app-eselect/eselect-java
-	|| ( dev-java/commons-logging:0 dev-java/log4j:0 )
-	>=virtual/jdk-1.7"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.7"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-MAVEN_DEPENDENCIES=(
-	juel
-	jsoup
-	log4j
-	jsr250
-	javax-inject
-	commons-io-1
-	osgi-core-api
-	aopalliance-1
-	commons-cli-1
-	commons-logging
-	interceptor-api
-	servlet-api-3.0
-)
-
-java_prepare() {
-	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
-
-	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
-
-	# Symlink jars.
-	cd lib || die
-
-	# Link deps.
-	for mvn_dep in "${MAVEN_DEPENDENCIES[@]}"; do
-		java-pkg_jar-from "${mvn_dep}"
-	done
-}
-
-# TODO: We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f025e16597b3..94d3fa3b827e 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index ac5d2f69254d..280140fc5fff 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -8,8 +8,8 @@ DIST perl-5.28.0-patches-1.tar.xz 17128 BLAKE2B f16843d9ecf27fa7d42dd59e1591d618
 DIST perl-5.28.0.tar.xz 12410536 BLAKE2B 620cca33c6d354b8b200bfff43dd155e6f89b9fe318f530d38c853a2b66fe67cc8410b6e5ab2a793d7ef578f2295a6fc4872483f81b5439d8573d75c5239fcfb SHA512 de701e37371b81cecf06098bb2c09017bde9cebaf9537d58838d0adf605ac2ecf739897b0a73576a7adb74d4cf65591ec4d2ed1f94b7191e695f88cb7e214a39
 DIST perl-5.28.2-patches-4.tar.xz 26268 BLAKE2B b32485a4ee0c23ab197641279915d1d2ff0b5fb46dad4e65b0c93a9b38025c5b4fdae2907b3f6aa5e1b6b5f80b5391b149613a0d3759519330c16f9b0e1dff91 SHA512 0c560ed52dcce2e9332192fead7bf0da416e5241616c2ee889cb9ca6fc3a133edb75e63e6e1217b8790c77611b92f57979491b4ffb02364c3f8361745f59c225
 DIST perl-5.28.2.tar.xz 12374448 BLAKE2B 82a49fcf3c29ff7241fae7ffaa1bf9f99d8cbfa6d00d5fd9ff7c3c23a461287322e12acba318c8de8507092e33b05549142bc5194bdb4b516994c9cdc0cb3f92 SHA512 0f2e4f7cb5d8cf6e00054b3842907e29b6c85902d97fb881d5bea65edbc875fef4e15e064561fac7c8db4939586576dd76a225026c7cca9624261c887b1fdb08
-DIST perl-5.30.0-RC2.tar.xz 12404196 BLAKE2B c75c9a0c00718e11e00171f8796a9c039bc639e21f755d6c23b396f08e3ec826226ddb7b2a78f73645774c798d564dc65b8800d841178ec072a1d256d94ef1c5 SHA512 5f11ad9951fa1a94553f71eef560007f700b8b4a6d5067896582c7abfe7afc406f504c26e67ce0da222ed7b240f7368537ceb6006dc6e3c7483c64280ec2679b
 DIST perl-5.30.0-patches-1.tar.xz 17352 BLAKE2B 67eb1c4ce6ada27e05962d06fa9c5675ca1d22623b5fd172ce8ceaa17f2e51d61f9451955f9f6acf6d97ea7d71c72b583be1378ccbf9174c88580baec2049a48 SHA512 4fe1f2de5e72e56890858148d20b772df63dce34cb3977ec47d8ed5323c4843929130f660f1558c282c97e65efa1c6d2fdacf9e2dcc0ef1d487a0b69dbb5bbb4
+DIST perl-5.30.0.tar.xz 12419868 BLAKE2B dbf64d4cb1995475ca5a84e487ecc81a422f835180fe96d88b5095e9bc6eff62863b0789d98f0f3d1265c8683b812839bff1622cfb90470f02a1863b0f827c7e SHA512 68a295eccd64debd9d6a10f0d5577f872a19ad8c2d702798f6b0f45b8c3af6ab3230768056e2131e9e2e2506d1035b27cfd627c845e32263fe448649c4b98ae9
 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
 DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a
 DIST perl-cross-1.2.2.tar.gz 106073 BLAKE2B c4eaf5d60dd0ac88a9653cea399f5583a699d35f94a69a36ef9d3cde0017901ff68029f12a3af6e0fd34d46accbb6be009167fadb790da8065f6b85115f1c9b8 SHA512 49dc190018b891daac68a954e2a9bab6294920f02b585c530dcc47af03e8ab51d402455202d45121fa206ee743986ddd50323658c179d2c15cb6af7a2eb0958c
diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild
index 981dadb521bb..0aa8109f0d68 100644
--- a/dev-lang/perl/perl-5.28.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.28.2-r1.ebuild
@@ -308,7 +308,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# do NOT mess with nsl, on Solaris this is always necessary,
 		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
 	fi
 
 	einfo "Applying patches from ${PATCH_BASE} ..."
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 7617ca59c9c2..88f49401029e 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -306,7 +306,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# do NOT mess with nsl, on Solaris this is always necessary,
 		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
 	fi
 
 	einfo "Applying patches from ${PATCH_BASE} ..."
diff --git a/dev-lang/perl/perl-5.30.0_rc2.ebuild b/dev-lang/perl/perl-5.30.0.ebuild
similarity index 99%
rename from dev-lang/perl/perl-5.30.0_rc2.ebuild
rename to dev-lang/perl/perl-5.30.0.ebuild
index e2165b86d03b..f16a51d1a1ad 100644
--- a/dev-lang/perl/perl-5.30.0_rc2.ebuild
+++ b/dev-lang/perl/perl-5.30.0.ebuild
@@ -85,7 +85,7 @@ dual_scripts() {
 	src_remove_dual      perl-core/ExtUtils-ParseXS   3.400.0       xsubpp
 	src_remove_dual      perl-core/IO-Compress        2.84.0        zipdetails
 	src_remove_dual      perl-core/JSON-PP            4.20.0        json_pp
-	src_remove_dual      perl-core/Module-CoreList    5.201.905.200 corelist
+	src_remove_dual      perl-core/Module-CoreList    5.201.905.220 corelist
 	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
 	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
 	src_remove_dual      perl-core/Test-Harness       3.420.0       prove
@@ -308,7 +308,7 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# do NOT mess with nsl, on Solaris this is always necessary,
 		# when -lsocket is used e.g. to get h_errno
-		sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
+		sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
 	fi
 
 	einfo "Applying patches from ${PATCH_BASE} ..."
diff --git a/dev-lang/php/php-7.1.27.ebuild b/dev-lang/php/php-7.1.27.ebuild
index 84292498c638..3be3c0289627 100644
--- a/dev-lang/php/php-7.1.27.ebuild
+++ b/dev-lang/php/php-7.1.27.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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.16.ebuild b/dev-lang/php/php-7.2.16.ebuild
index dc25d150df81..30968e0621d4 100644
--- a/dev-lang/php/php-7.2.16.ebuild
+++ b/dev-lang/php/php-7.2.16.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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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.5.ebuild b/dev-lang/php/php-7.3.5.ebuild
index 1e66c720846d..e8bbeb8dbb09 100644
--- a/dev-lang/php/php-7.3.5.ebuild
+++ b/dev-lang/php/php-7.3.5.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index 6b628a965d4f..38fdeca542b7 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1 +1,2 @@
 DIST sassc-3.5.0.tar.gz 25834 BLAKE2B 69bb085f537ca2fba70aa96326e49f756cab52a8cac631dbe0dc88459a488c65dd856deebea335d4b3539b30658b327c3d32d1e79dae1021893a0627508ceadd SHA512 9c94056f66688016dd8eaae9cc791be4b397406b89f1289946c4481b5e1904486878d22fd65e695ed89f9b41a9f902932eb4074e7b0923ce3d4823ea3140334f
+DIST sassc-3.6.0.tar.gz 26111 BLAKE2B 91d634bd652607407c48f141aa39260739357f6eeb4bade1fff1bfdd4e4e6e0757712501395c913ef1a8944ec9174649fa5ce657af4afec6f9f0eb7f804e1ff2 SHA512 0d8de651b1587f4994a5da85ad09ec2ce6e240213dbaa567c6b9baa612fe82e337061d9a5a8a3a5588e4c366c1178b6fd04e9d699a0be3d83c68f98bac774527
diff --git a/dev-lang/sassc/sassc-3.6.0.ebuild b/dev-lang/sassc/sassc-3.6.0.ebuild
new file mode 100644
index 000000000000..bd5bdc6e9bd3
--- /dev/null
+++ b/dev-lang/sassc/sassc-3.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+DESCRIPTION="A libsass command line driver"
+HOMEPAGE="https://github.com/sass/sassc"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libsass:="
+DEPEND="${RDEPEND}"
+
+DOCS=( Readme.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-lang/sassc/sassc-9999.ebuild b/dev-lang/sassc/sassc-9999.ebuild
deleted file mode 100644
index 847d2e349e3a..000000000000
--- a/dev-lang/sassc/sassc-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/sass/sassc.git"
-	inherit git-r3
-	KEYWORDS=
-else
-	SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A libsass command line driver"
-HOMEPAGE="https://github.com/sass/sassc"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsass-3.5:="
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != *9999 ]]; then
-		[[ -f VERSION ]] || echo "${PV}" > VERSION
-	fi
-
-	eautoreconf
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 45bd579129fa..b2057642608b 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index a4d3584e8c93..f5a1fba08fe7 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index c85b2c25153a..0cad8da59725 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,2 @@
-DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
diff --git a/dev-libs/efl/efl-1.20.7-r3.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild
deleted file mode 100644
index eb9d5b8d1fa2..000000000000
--- a/dev-libs/efl/efl-1.20.7-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent"
-
-REQUIRED_USE="
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib:=
-	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	pixman? ( x11-libs/pixman )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( >=media-video/vlc-3.0.0 )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			xpresent? ( x11-libs/libXpresent )
-		)
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-libs/elementary
-	!media-plugins/emotion_generic_players
-	!media-plugins/evas_generic_loaders
-"
-
-src_prepare() {
-	default
-
-	# Remove sleep command that forces user to read warnings about their configuration.
-	# Back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die "Sedding configure file failed in src_prepare."
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libmount
-		--enable-xinput2
-
-		--disable-eglfs
-		--disable-gesture
-		--disable-gstreamer
-		--disable-image-loader-tgv
-		--disable-tizen
-		--disable-xinput22
-
-		$(use_enable avahi)
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable ivi wayland-ivi-shell)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-	use X && use xpresent && myconf+=( --enable-xpresent )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake || die "Compiling EFL failed."
-
-	if use doc ; then
-		V=1 emake -j1 doc || die "Compiling docs for EFL failed."
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	einstalldocs
-
-	V=1 emake install DESTDIR="${D}" || die "Installing EFL files failed."
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index f3a7227c4bbb..5920ddfb2a91 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -20,11 +20,9 @@
 		<flag name="hyphen">Enable text hyphenation support</flag>
 		<flag name="ibus">Enable Intelligent Input Bus</flag>
 		<flag name="ico">Enable Ico image loader</flag>
-		<flag name="ivi">Enable ivi-shell support</flag>
 		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
 		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
 		<flag name="physics">Enable Bullet physics effects and support</flag>
-		<flag name="pixman">Enable PixMan for software rendering</flag>
 		<flag name="ppm">Enable PMAPS image loader</flag>
 		<flag name="psd">Enable PSD image loader</flag>
 		<flag name="scim">Enable Smart Common Input Method</flag>
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index fdf4025a8936..4950eecace42 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
index 934729a10233..cf81bd1fae3d 100644
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ b/dev-libs/gjs/gjs-1.54.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
index 0f5203bddc06..44863f737714 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
index efe008f99812..a587d45c8e11 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-s
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index c0d84349895e..b9d609b780e8 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 60c9dbb0da46..0ee958213d40 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,2 +1,3 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
+DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
new file mode 100644
index 000000000000..01d96ca954e5
--- /dev/null
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for asynchronous I/O readiness notification"
+HOMEPAGE="https://github.com/buytenh/ivykis"
+SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libbpf/libbpf-0.20190404.ebuild b/dev-libs/libbpf/libbpf-0.20190404.ebuild
index 2ffb199b195b..e26002cb967f 100644
--- a/dev-libs/libbpf/libbpf-0.20190404.ebuild
+++ b/dev-libs/libbpf/libbpf-0.20190404.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="static-libs"
 
 COMMON_DEPEND="virtual/libelf
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 855dacd8f7e0..ddd2ffeedc5e 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,4 @@
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
+DIST libgit2-0.28.2.tar.gz 4987586 BLAKE2B cf791adb173050b4b153062ff5fdc923289462677ce34af1077d228a95c4d9d7e9b836aee44dc79f079f42c910c4b4548241ec7ff16665ce49e319ccd38d4c7a SHA512 0879c162e2e1dc00eadfbda22cd1f9d3a95b4ec2b653c108983f37c2f695140882de4d50d7cbc04ced247125a4e9fe6df16130e1267891aecdb2411d920db5c6
diff --git a/dev-libs/libgit2/libgit2-0.28.2.ebuild b/dev-libs/libgit2/libgit2-0.28.2.ebuild
new file mode 100644
index 000000000000..89a49f8ac99d
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index d0547e218f67..2a3140970bd5 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1 +1,2 @@
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
+DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
diff --git a/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..1ef0817bce7b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.4-pkgconfig-libdir.patch
@@ -0,0 +1,24 @@
+From 111ee5ff9daf7db21ad0b6874c4b7cc05baf4703 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 8 Jan 2019 22:13:47 +0100
+Subject: [PATCH] Fix typo in libical-glib.pc.in
+
+Missing '$' causes compiler warnings about missing-include-dirs, due to
+the {includedir} not being properly replaced with the variable value.
+
+Signed-off-by: Allen Winter <allen.winter@kdab.com>
+---
+ src/libical-glib/libical-glib.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libical-glib/libical-glib.pc.in b/src/libical-glib/libical-glib.pc.in
+index 42f1ffe5..e164cfb5 100644
+--- a/src/libical-glib/libical-glib.pc.in
++++ b/src/libical-glib/libical-glib.pc.in
+@@ -7,5 +7,5 @@ Name: libical-glib
+ Description: A GObject interface of the libical library
+ Version: @LIBICAL_LIB_VERSION_STRING@
+ Requires: glib-2.0, gobject-2.0, libical
+-Cflags: -I{includedir}
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lical-glib
diff --git a/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
new file mode 100644
index 000000000000..187a5de0cd4b
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.5-fix-lots-of-params.patch
@@ -0,0 +1,24 @@
+From f02ca493123b7c8e8eaaa758d787e9e2753fd9b8 Mon Sep 17 00:00:00 2001
+From: Kent Sutherland <git@ksuther.com>
+Date: Fri, 17 May 2019 13:26:52 -0500
+Subject: [PATCH] Include invalid parameters in the maximum number of allowed
+ parameters Fixes hangs when iterating lots of invalid parameters (valid
+ parameters already have a cap from f6c64896988644a7c6d4d5060f6ab574c2a62fbf)
+ oss-fuzz issue 14809
+
+---
+ src/libical/icalparser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c
+index 99803418..fa71e8bd 100644
+--- a/src/libical/icalparser.c
++++ b/src/libical/icalparser.c
+@@ -1098,6 +1098,7 @@ icalcomponent *icalparser_add_line(icalparser *parser, char *line)
+ 
+                     icalmemory_free_buffer(str);
+                     str = NULL;
++                    pcount++;
+                     continue;
+                 }
+             }
diff --git a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
similarity index 97%
rename from dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
rename to dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
index aae02abc537d..a3a80e9f76f5 100644
--- a/dev-libs/libical/files/libical-3.0.1-pkgconfig-libdir.patch
+++ b/dev-libs/libical/files/libical-3.0.5-pkgconfig-libdir.patch
@@ -38,7 +38,7 @@ Fix pkgconfig libdir paths.
 @@ -8,4 +8,4 @@
  Version: @LIBICAL_LIB_VERSION_STRING@
  Requires: glib-2.0, gobject-2.0, libical
- Cflags: -I{includedir}
+ Cflags: -I${includedir}
 -Libs: -L${libdir} -lical-glib
 +Libs: -lical-glib
  
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index 2dbe0b25537d..3e1efabd39b7 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -41,8 +41,8 @@ DOCS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
-	"${FILESDIR}/${P}-tests.patch"
+	"${FILESDIR}"/${PN}-3.0.{4,5}-pkgconfig-libdir.patch
+	"${FILESDIR}"/${P}-tests.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
new file mode 100644
index 000000000000..689ab21243af
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="berkdb doc examples static-libs test"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( ${PYTHON_DEPS} )
+"
+# TODO: disabled until useful
+# 	glib? (
+# 		dev-libs/glib:2
+# 		dev-libs/libxml2:2
+# 	)
+# 	introspection? ( dev-libs/gobject-introspection:= )
+DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+"
+RDEPEND="${DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${P}-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-fix-lots-of-params.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICAL_GLIB=OFF
+		-DGOBJECT_INTROSPECTION=OFF
+		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DSHARED_ONLY=$(usex !static-libs)
+	)
+# 	TODO: disabled until useful
+# 		-DICAL_GLIB=$(usex glib)
+# 		-DGOBJECT_INTROSPECTION=$(usex introspection)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake-utils_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 328252c5ac32..cda8c0fb3658 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index f01b33214f82..f9684efda111 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 215e38910cd8..6e2d9e25a205 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,3 +1,4 @@
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
 DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
+DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
new file mode 100644
index 000000000000..b9ba51552c33
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/47"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libslz/libslz-1.1.0.ebuild b/dev-libs/libslz/libslz-1.1.0.ebuild
index bf812e97c808..dfda44e0c7f4 100644
--- a/dev-libs/libslz/libslz-1.1.0.ebuild
+++ b/dev-libs/libslz/libslz-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="amd64 arm ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="static-libs tools"
 
 DEPEND=""
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 4b4af468640e..5e63acd9acb3 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,3 +1,4 @@
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 DIST libuv-1.29.0.tar.gz 1223722 BLAKE2B e4e7e3e3c0668a573a29bd90b0bd63954fe0c03a195c420df5d7997fd79475f997117d09bf81aec5b58a57482aa8b3ad50cd7892249697e256340b36a720fd6b SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
+DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
index 6fe68c68f88e..508d63293cdd 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libuv/libuv-1.29.1.ebuild b/dev-libs/libuv/libuv-1.29.1.ebuild
new file mode 100644
index 000000000000..6fe68c68f88e
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.29.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 16a917a37f50..c0f9704b16c4 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index c58ae4a73832..95c3608bf77c 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
 
 DEPEND="
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 84e891c31927..51290880bc5d 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index fe37df29542d..160fb5e9d92f 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,6 @@ DEPEND="
 	)"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc-7.patch"
-)
-
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 9707a9ad8aa7..92686eca94aa 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
 
 RDEPEND="
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
index f95cfbb27738..b113ecc582dd 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.14.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos"
 IUSE="lua perl python php ruby"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index d7fa804dcef5..987b257ff816 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 716194bf0d93..1cf628a11ac1 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 6e8b08b93d41..83b4360fbaf7 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index 0e7ec004ef21..010e78ee18c2 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
diff --git a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
index 728bd9d99236..d0c7a5173855 100644
--- a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
+++ b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
index c4df93414b3a..7541e8f80413 100644
--- a/dev-perl/GD/GD-2.560.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.560.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="animgif gif jpeg png truetype xpm"
 PATCHES=(
 	"${FILESDIR}/${P}-rt106594.patch"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 405ad485f42b..323a62d6e1ab 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
index 40a566bae540..6c90faa90322 100644
--- a/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
+++ b/dev-perl/XML-DOM/XML-DOM-1.460.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
index b8a78d5af567..de74c89a03c2 100644
--- a/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
+++ b/dev-perl/XML-RegExp/XML-RegExp-0.40.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Regular expressions for XML tokens"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/XML-Parser-2.29"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 57ed46dc8e5b..7f4e8892defc 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index 05ffb8659958..2ba2f23aedf8 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="crypt test"
 
 RDEPEND="
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 484748d7ecdc..0b0b57a9b3d1 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index 93fa2316c1e4..e0e394b4eedf 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/click-plugins/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index c35c830c1e0d..742dad4e5124 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,4 @@
 DIST fido2-0.3.0.tar.gz 125907 BLAKE2B 95054f258c775ac3b4f65608fd3b62ec4165a568c237064ebb66da1ca6ae899a3d88b5613e9dd4be87c05068ebd698be452dd3467800317e5894092216196e12 SHA512 c6ea83e104d77350413156eba4c1aa2635b77ae00d157dce61e5a8539c65aca4dd1dfc5303f9d408359582eeb98ae558aa1e2043a9b1dfcb23415eb8bc9c6a09
 DIST fido2-0.4.0.tar.gz 141714 BLAKE2B 3d57ef1598d2c84cea8a98e75cdef96b77807d4eb5951515560b43655a48bb0816c4e05ef39314b13b6bad84509e09145aeab5727a9fc6cba65ddf42f588b007 SHA512 4eb95a95e1f5b8b49267bc0a11e5501bd041a211ac8a6249ff9cc26ebb0b155b9d16494c18391a14feecb197d61dc50c8530b2ab38ba7e9dc600276abd6f8bcf
 DIST fido2-0.5.0.tar.gz 161562 BLAKE2B 20d4f6c4e54366a26d5a56a84a6ff84bec0f0e22107aa612db721df8a5186a2129373ae609fb58a27008dc700b4b92d607fc2bf16aab7ac6bff8d9e7219204aa SHA512 fa83848e179b9208e2a701a3330faa1dde75e5e23133540eaec896145dbde376bc424a5e59865d3cf90c5765882e22530e96df2491101d2b5dcb22cfc4bcbb87
+DIST fido2-0.6.0.tar.gz 163137 BLAKE2B 3a30d4267a1aae00eac8fa8c05065163f992b72895097aca95dba72300bd9c30373c7537a867e532949af779e8e7528e1a3aad8f04cb0170678675294757b5d4 SHA512 1fb8e591480ac2ac9c405e4fc74895d55d630e462626f849952193c3ae6720104cca1da47af1f89adbcc026034f69dba12fc38577b00f9802434db2162d0d1d5
diff --git a/dev-python/fido2/fido2-0.6.0.ebuild b/dev-python/fido2/fido2-0.6.0.ebuild
new file mode 100644
index 000000000000..59d15dc14264
--- /dev/null
+++ b/dev-python/fido2/fido2-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="test" # Tests partially fail due to stable openssl not supporting ed25519
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index 50b502713c17..bf83eb39831e 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index a2bf29a30cfc..ba76f79c7163 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
index a5a156d90816..52d35e9c77a0 100644
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ b/dev-python/jinja/jinja-2.10.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 4b9e08d38901..40fd882b7290 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -4,3 +4,4 @@ DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e6
 DIST llvmlite-0.27.0.gh.tar.gz 186891 BLAKE2B c7175beeb5c45b6fda62b78b23352d1c22111a37e7fdb89897409c6ab245dab23aa4f799fd5add1bf2199e8f6783d6094101aa29c4afefa2a3dbd48d735b418a SHA512 6c3230f23fec53ddff077c885bc0da4a773049d0226817142e2b7ded9fe6a665dd5cf8c6468101b342ef8e3b394bf2078cf93fc513e46fe451cd75755111448b
 DIST llvmlite-0.27.1.gh.tar.gz 186904 BLAKE2B ee3af4b3ec03799ea6e643e0ee0a793537c46427d239fb3a26abf4a719b68432f403367321345c30a95758ce1bce411495bc48273dbf2452a872a1edd67dc9a4 SHA512 365ffd95050a39269d9f806d3969657437111b8e999db6cf03d0d99fc5bcc024dbc08f1d379745572317f8d4384d7f86095216674695c34f463a0b9bf48a8be7
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
+DIST llvmlite-0.29.0rc1.gh.tar.gz 196498 BLAKE2B 6db47948ac38bf61df7bf5eef60a29ac710d259b9b3fdcf8d9cb52239de85211969a34f707c155170e5b42d060e2d3e8616cf1b7720ebc808bddcc427a144bc9 SHA512 80f06584d52fe5947a06eec9ee88ba51c29847f53b4a2c9b21c660478c9e3f873f80677ebcffe1678e327d1132170bdc97737c385823ca0cbbfa9d9f1158cc0a
diff --git a/dev-python/llvmlite/llvmlite-0.29.0_rc1.ebuild b/dev-python/llvmlite/llvmlite-0.29.0_rc1.ebuild
new file mode 100644
index 000000000000..98ff820616ca
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.29.0_rc1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=8
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${P/_/}
+
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_configure_all() {
+	# upstream's build system is just horrible, and they ignored the PR
+	# fixing it, so let's build the shared lib properly using implicit
+	# make rules
+
+	export LDLIBS=$(llvm-config --libs all)
+	export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+	export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+	local files=( ffi/*.cpp )
+	emake -f - <<EOF
+ffi/libllvmlite.so: ${files[*]/.cpp/.o}
+	\$(CXX) -shared \$(CXXFLAGS) \$(LDFLAGS) -o \$@ \$^ \$(LDLIBS)
+EOF
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index cf82f2ee3ffb..c2d5b696e55d 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 6ae6d5e12c56..622d03a2b10f 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/lz4/lz4-2.1.6.ebuild b/dev-python/lz4/lz4-2.1.6.ebuild
index b1f535b1d153..3e1188a0b8e8 100644
--- a/dev-python/lz4/lz4-2.1.6.ebuild
+++ b/dev-python/lz4/lz4-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
index 7b8c7c8b7dd1..75e216ddee17 100644
--- a/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
+++ b/dev-python/paho-mqtt/paho-mqtt-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/eclipse/paho.mqtt.python/archive/v${PV}.tar.gz -> ${
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index 0e3f3ed85709..d7c7d2612789 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/pathtools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index 1823ef123659..f41c378e86f0 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index f378e476ae04..090df1fe6d24 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1 +1,2 @@
 DIST progressbar2-3.39.2.tar.gz 131723 BLAKE2B d8ff04986e125d17b67d86399308c4f7ca55c1dc744e2cd42042fb61ec0b93e61f6af1308e884e24e1b423a5ff66e3074b30ce75c0fb7af85acb700288a7bcc0 SHA512 efbf08a09665542fc361757c2a649ecc3bff0077e68b2669f4dfe1635e7730cf3cd0c6a3ae13e059adada31dc77b291098c21746ed9b5e0929260d2788345d6b
+DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
diff --git a/dev-python/progressbar2/progressbar2-3.39.3.ebuild b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
new file mode 100644
index 000000000000..5e98c5dd5bf5
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-3.39.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
+
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/python-utils[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}"
+BDEPEND="${CDEPEND}"
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 8b01915169d7..9d539e717e1d 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
index 9f067d1aa5e1..ce5985e3be7e 100644
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ b/dev-python/pygments/pygments-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pynacl/pynacl-1.3.0.ebuild b/dev-python/pynacl/pynacl-1.3.0.ebuild
index c0afe300d433..0e882379de60 100644
--- a/dev-python/pynacl/pynacl-1.3.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index b0f4c0da85d8..232bc136c3b9 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 647156c27c0d..5cddca1d3c3b 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="png"
 
 RDEPEND="
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index d273097c8000..adbbf8912f9a 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
index bd24410195be..9aa6daa7f23c 100644
--- a/dev-python/python-utils/python-utils-2.3.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 pypy pypy3)
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3)
 PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
 
 inherit distutils-r1
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 72cbe7cd1866..2193998d888e 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index f7f636a1a267..32f070a4bb51 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index 25b4a305f5a0..2b3450e358e5 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-repoze[${PYTHON_USEDEP}]
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index f6cc282c1fd0..877af9d028a7 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 6b16ecc60155..97ffcae4bc45 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index a3ae4a9d6532..0b2aad954b05 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 SLOT="0"
 
 DEPEND=">=app-arch/snappy-1.0.2"
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index 4654ab7ea6a8..13ca53a22ff2 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://pypi.org/project/python-snappy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND=">=app-arch/snappy-1.0.2:="
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 25329b886ad2..eb170d9b9d64 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index b6598411947a..faa0bd239c0d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,3 +1,3 @@
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
-DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
+DIST tox-3.11.1.tar.gz 280761 BLAKE2B ef6cacf45c4befecf8d1fcc92c7cb682318018cad3c77c3f2d1cf7110927d2ee0027908ad634a6d30bc56787b2a05032c8709aadda4512bcb392f299ba3b075e SHA512 3c2a4dae6aaea0a9a6a6b4a8bd862b0fb2ff6f08e2ddcecc808e43c444d17e1abd3324428648ced50663b439735a7727f4e780874593e50dc5eb0a714c704d12
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
diff --git a/dev-python/tox/tox-3.10.0.ebuild b/dev-python/tox/tox-3.11.1.ebuild
similarity index 100%
rename from dev-python/tox/tox-3.10.0.ebuild
rename to dev-python/tox/tox-3.11.1.ebuild
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index 28ad28fd8287..4498125e41bd 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 78ce128bfb47..8edd4804382a 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index 54860fcdb3df..9d430018e40a 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/watchdog/watchdog-0.9.0.ebuild b/dev-python/watchdog/watchdog-0.9.0.ebuild
index 0d02a7f7efc6..3f69c35283a1 100644
--- a/dev-python/watchdog/watchdog-0.9.0.ebuild
+++ b/dev-python/watchdog/watchdog-0.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 3423950a545a..56673cfd1393 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index 6df715810d92..859abebdd9c7 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index d2d115285188..704df490e28d 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 6d109d6a499a..b17f16ea7cff 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.12.3.ebuild b/dev-qt/designer/designer-5.12.3.ebuild
index ba8d912cfba0..aac554c5275d 100644
--- a/dev-qt/designer/designer-5.12.3.ebuild
+++ b/dev-qt/designer/designer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
index 7f79197d7425..6de137aec601 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.12.3.ebuild b/dev-qt/linguist/linguist-5.12.3.ebuild
index 28d6c0c8b63e..718f89d39e97 100644
--- a/dev-qt/linguist/linguist-5.12.3.ebuild
+++ b/dev-qt/linguist/linguist-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
index 3e68ab764c7c..0d4c42f53aec 100644
--- a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.12.3.ebuild b/dev-qt/qdbus/qdbus-5.12.3.ebuild
index d13d3104c983..d0f1c97c0476 100644
--- a/dev-qt/qdbus/qdbus-5.12.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
index 09dd13e84c14..8c26af935932 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.12.3.ebuild
index 02aa22c368e9..4c4cddc481d5 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
index 9f6dfa1aff4d..cd1047c3db7a 100644
--- a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qt3d/qt3d-5.12.3.ebuild b/dev-qt/qt3d/qt3d-5.12.3.ebuild
index 875c47d5ed08..1a3b07dd2670 100644
--- a/dev-qt/qt3d/qt3d-5.12.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: gamepad, tools
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index c610b7cd0001..530491649d5e 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtchooser/qtchooser-66.ebuild b/dev-qt/qtchooser/qtchooser-66.ebuild
index 6582e4b0d479..3c6674f9251d 100644
--- a/dev-qt/qtchooser/qtchooser-66.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
index a8d2c0d80bfb..4ae46b805223 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.12.3.ebuild b/dev-qt/qtcore/qtcore-5.12.3.ebuild
index 2aa86f3a4a1c..1b353a1281a1 100644
--- a/dev-qt/qtcore/qtcore-5.12.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
index 74192731918d..21a6c303f73e 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE="gles2 qml"
diff --git a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
index f8e4dd27c46b..1f9bce16b43c 100644
--- a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
index b3c3411fbb0a..5b87a6828b64 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
index d7d01db85a26..52449ef4566a 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index fa203bb4482e..b2d0586a9485 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index 943173a184c2..c55b1332ec87 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index 37e545353652..1c0f3deeca24 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index 25dc50ab1019..c794a227d3aa 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index 6d8241532e20..1d9b55c6126c 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
index 8312d0c13577..6117b50e673d 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
index 92b8093e0129..c510aaf36973 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
index c1ee20acd663..a21bde4ea2b9 100644
--- a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
index b0988877f904..acb53078e5e6 100644
--- a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
index a6334e9a87d7..c8264075c307 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
index faa7032b87a9..41892707e2a3 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
index 918b4e495412..40721a02bf26 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
index 3e47b88ddedc..c23225e3ef8b 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/qtscript-5.12.3.ebuild b/dev-qt/qtscript/qtscript-5.12.3.ebuild
index 075e8bd8b707..92093efd2ef9 100644
--- a/dev-qt/qtscript/qtscript-5.12.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild b/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
index 43f3d8b3e1c9..067b60bd6b00 100644
--- a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
index 675f29c7e3b4..aa3c41c6e30d 100644
--- a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
index 4d918afef30c..a29d044cb563 100644
--- a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
index ee3692ccfce5..83525d619091 100644
--- a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild
index 92ce286d3e5d..e86a19f8a606 100644
--- a/dev-qt/qtsql/qtsql-5.12.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
index ad774a2c3286..318653905bd0 100644
--- a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.12.3.ebuild b/dev-qt/qttest/qttest-5.12.3.ebuild
index b365a47c8733..e9113eb02c89 100644
--- a/dev-qt/qttest/qttest-5.12.3.ebuild
+++ b/dev-qt/qttest/qttest-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
index 9ddb031a518c..e1c17f530084 100644
--- a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
index c6f4faa3268e..7b5bca17165f 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
index dcdeeaa61c32..97be272de066 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
index 03797ea36908..84e743ac55d2 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 1dc84dc7c80b..893d775d8ce4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index b80875f5a23a..5744cb31b696 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
index f1ee2b9f2a3c..601a90b93821 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
index 6245a6cc5506..d1194a056ed2 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.12.3.ebuild b/dev-qt/qtxml/qtxml-5.12.3.ebuild
index f0c71f595c2a..dc4931cb6839 100644
--- a/dev-qt/qtxml/qtxml-5.12.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
index 7a53e251e4f8..cba805f6914d 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index de5a0e702353..2bd61cb7dcd8 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index c41f56db1521..0cc484db3bde 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,4 +1,5 @@
 DIST ffi-git-1.10.0.tgz 166192 BLAKE2B a663da1272a41464bcc3fd6a69055615beaa75aca09da60a4459034230ddb7768573e6a91e75b0e768f16333f23e55e045b6cff3be63c5138c85070903cea869 SHA512 f4a7faa02eda8e67b4c05ecc93ed1848daa9d55ec2eaf367947dbb4cf6b0edd76db1e8232db0a17828df40c3cdabb9f7edac11b44f9de00bdb69d0c9a84d4409
 DIST ffi-git-1.11.0.tgz 156535 BLAKE2B e4c5e6406ff6603a3c41146d6ec3f07fdc3ba2243349b6a77083c195e1b9b40648950c82bcdbb846189b3162c43b23b3cabcde92a4e6f2f9fc8c4ccf03ac473d SHA512 38c66841fb33f7fe7abf0186ef48e28525b9b50450dd886716662ee8cd630374abb41a2fa5fec9cebdcae0e8ffa76ba5b36d89bd441d09a54503032c3950dd08
+DIST ffi-git-1.11.1.tgz 156715 BLAKE2B 4ea2d0f54dc6ef327c57408e568c5f728f5c387e810e25b6becab8119ebd8a20d6c834a80c1ababf3fd4fc4a4d4253146fc161f93fbf02e153f73fc812bad309 SHA512 7f6c2ae66a2ffc40b154ada2d3e2c0f81e79803ba693ce2a83d16ac6a210ac5494bcc4b28948b3b68c9802a7cacce77e4a7cb1c3c1105039c08c50e5c8137fd4
 DIST ffi-git-1.9.18.tgz 901805 BLAKE2B b04715095858d461e4a0a904185dbd603e391611ef446de385deb533d8fcbff0ada3f1865599fb51e3446df629c16d491c476e179cfa356c7d8c84e1827b2729 SHA512 49c52e5e42e436b7969c35a34b28bd7929d75372638ac5373486a1d624026c12dc682009bc101e4a2c8f1442ed6f1ba17b438cda2e02d4256622b489c4bd9945
 DIST ffi-git-1.9.25.tgz 164209 BLAKE2B aab3addb5d9138f81d0688ad628082e7aef5f96a1b046dfa57a7195dcf7432533052bb397ac8335f7b17ffece9424fad7d986065a82ac91437e0d8d27d76ac77 SHA512 94a45f4152458d6aedf50645c8074626dcde4326093a606e509c3fbcaac79a1e6a9f7df624f14946db4f3767ef6fb3e311e60531c209676e66ebbf21b07a6786
diff --git a/dev-ruby/ffi/ffi-1.11.1.ebuild b/dev-ruby/ffi/ffi-1.11.1.ebuild
new file mode 100644
index 000000000000..3f78f61b9bd1
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.11.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 8101fc8bb181..56742c89562e 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,2 +1,3 @@
 DIST haml-rails-1.0.0.gem 13312 BLAKE2B 9bd863d693121f2bb42bc0dc292f647220a4ba0b152c2fe6b04fabc0a0b537e1d31c12b040841ea2ac51cbfa771bdf21a94c8e482978dd2294a709916ee3aa06 SHA512 92aca4aa20591e47830779ec9d7a04f67cbcfbdcea3cbf2cbe50862ee61d1e373db96dcdb9b187fce2a167132b8394dc738db09416492689fb138d60f537b593
 DIST haml-rails-2.0.0.gem 13824 BLAKE2B 4d885be047f972cea11d3c7d0a9e56d557763d5bf3e95e7cefab33a4422ad114f6351db3226cd1d7645082d70f03a9ecbf86d6ef089ac0ab8836b74736d7ecc8 SHA512 47c5adfeb7b24ccf83ada7c2b453696f3544bc2ed4e7de3ae8ab52a64f6b5f3a3cef36f3144600c47b2f647ec42fd40d32651c7cd1b90184b767f81ec33ac855
+DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
new file mode 100644
index 000000000000..3cfe4a30206c
--- /dev/null
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides Haml generators for Rails 4"
+HOMEPAGE="https://github.com/indirect/haml-rails"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
+	>=dev-ruby/activesupport-5.1:*
+	>=dev-ruby/railties-5.1:*
+	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
+	>=dev-ruby/html2haml-1.0.1"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
index b4da9b300e95..359c802b8fbd 100644
--- a/dev-ruby/metasm/Manifest
+++ b/dev-ruby/metasm/Manifest
@@ -1 +1,2 @@
 DIST metasm-1.0.2.gem 746496 BLAKE2B e7248ba61702fa74d2f53b6f8f112d1cbc113742891478c932151771a6ec66bc560d1b6d2a886c018e48d64e515c5a09e4c9d98deea7608dc2579741117bb04b SHA512 b5f90e46be0d3b86c2b525823aa1fc1ea711a8abe9edaf2908af73d869e1f6dc5163f45ea20bd1034b0f10b17c25e7b7cd9af6a77ebfbf24d925a68a84d264e3
+DIST metasm-1.0.4.gem 802816 BLAKE2B 8950f4c3c0d56bc414795c5a348fb07767223163c1cece4a7b5f5374b1c9c901a576b6adbb10d28b6b4541649e176863ad68da3a7e2155025c7f1bc9eaadff90 SHA512 35fe98bfd9d8b2f0d6a69cce409319288d9a54458f22a308682c3ea432e2c34d50d33a3849c08f773e87ee0a67aa5cc6bb337ec99045f23b6aca43c9f5ce70cc
diff --git a/dev-ruby/metasm/metasm-1.0.4.ebuild b/dev-ruby/metasm/metasm-1.0.4.ebuild
new file mode 100644
index 000000000000..c8698af680ca
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="https://metasm.cr0.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE=""
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+all_ruby_prepare() {
+	mkdir bin
+	ln -s ../samples/disassemble.rb ./bin/disassemble
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper disassemble
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/packetfu/packetfu-1.1.13.ebuild b/dev-ruby/packetfu/packetfu-1.1.13.ebuild
index ca383b97edd9..c065d55b827f 100644
--- a/dev-ruby/packetfu/packetfu-1.1.13.ebuild
+++ b/dev-ruby/packetfu/packetfu-1.1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 
 ruby_add_rdepend "
 	dev-ruby/network_interface:0
-	dev-ruby/pcaprub:0.12
+	dev-ruby/pcaprub:*
 "
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )
diff --git a/dev-ruby/podcast/podcast-0.0.4-r2.ebuild b/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
index 09e6f85e7672..801480697d65 100644
--- a/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
+++ b/dev-ruby/podcast/podcast-0.0.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 7422e98cdcfd..bc29ca86721c 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -5,3 +5,4 @@ DIST selenium-webdriver-3.141.5926.gem 865280 BLAKE2B f1113b2e229788fcf2351d3ee4
 DIST selenium-webdriver-3.142.0.gem 865280 BLAKE2B b4175f4458727291659af21fff60268e022a241df73c502219f010d0d6d59a76b291894e4f70825c55587ed119692e27eb0394abd18aa5da83ded87581e083a0 SHA512 e0e2664dc500c99d0ff9163426b8049c7b4a03bd40616d4f2f0fc0ea2d67557e22853a61d374009e9e0ba3888f0e97f85e5cfa4eaa794c1158d41caff7a05686
 DIST selenium-webdriver-3.142.1.gem 865280 BLAKE2B d28d58cfbab64d83e28c65fa9b639f05dbab87c454ffde4507ce0a90e744006bea1e93b2fa35303b0bc17ff7423e84bb052a7f0072c7f915bdc758fb2ceabd86 SHA512 90746d11c5f7af086392ed70994d17c05c3cd5d839f743a5587c0e06dbc98f3882f4a5846cfef68110b4b4860c3980ac50e1017f9a445a296c0b0bde0ed18ecd
 DIST selenium-webdriver-3.142.2.gem 865280 BLAKE2B 8182b2eda9ab448c044a270d304364bf3f38bd1dd98580ae34c8e22fc0364a1b20629a7f91f3edd2d171fb03e76eb4762eec1cd6b255559a9809c6533cd484d2 SHA512 87998117e960812a26a09c2a45aad7145fec6be5fd3ff34a3a464969a720a7e04f39ebb93fdf7e56183f06f3e5e01e1f7441af80a1d061fc14fb186959030462
+DIST selenium-webdriver-3.142.3.gem 865280 BLAKE2B 9ff97810a1d377293b3d5f7dde91561856a4b44295b9d7ec04a8af257ebebe7765ed1ba32e7f072fceb0760b85358ce0fd10b43092a54bdbc8f42e2a9d54402d SHA512 048c1f82f1a53d4de610c5ff32acaa05907ef2d772c68d2d5ddb1fd232cf03eeef9c15ff1096a97acce026d0f4dd730ae35d7ae5d1b06ff3b49968f987704696
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild
new file mode 100644
index 000000000000..8233dcd590b6
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="https://github.com/seleniumhq/selenium"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5 <dev-ruby/childprocess-2
+	>=dev-ruby/rubyzip-1.2.2:1"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index eec73bf7c03c..231c7939ce3b 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild
index f23a490a9026..1f720a826ce8 100644
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ RESTRICT="test"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+luajit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 81d37ad3721c..74351e85e8c4 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	BDEPEND=""
 else
 	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	BDEPEND="app-arch/xz-utils "
 fi
 
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 81d37ad3721c..74351e85e8c4 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	BDEPEND=""
 else
 	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	BDEPEND="app-arch/xz-utils "
 fi
 
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild
index 2ac1d33b78f3..da0543af88bd 100644
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ b/dev-util/cmake/cmake-3.14.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 
 RDEPEND="
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index e101b3d26a07..9010cedf0086 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,2 +1,3 @@
 DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
 DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
+DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
diff --git a/dev-util/flawfinder/flawfinder-2.0.8.ebuild b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
new file mode 100644
index 000000000000..cf9cdb27f945
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+	default
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 2b00d9960cb2..64311cd6eece 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,2 +1 @@
-DIST goland-2018.3.4.tar.gz 298506989 BLAKE2B 9fd4db8c178c0a749c685b5e77da22717923f1da2371e92246eec3422e8041c3d8c975ffc562e92dcfdd0580297f4ffc0569e82ffea231cc3688b5570b4af7cd SHA512 ce7efbea9b531079dfae241f4817f04bb3969a65b1b8d6128b28d82b0262dfe3881ae1b6ceeff4fd3a084743d2ad512dd948f231a66f3b6a4347c522409cc81d
-DIST goland-2019.1.1.tar.gz 311687094 BLAKE2B ea7d23a5a835790801f781d19949b997358b8174f8b7551096a9df254dbbaf8bc8fd5f6a7e55a6016c0cebab363d98669fdaba1b9673e13f44ece6da7bcf2cf8 SHA512 c617c9af6f31b7b83f921ca41500341ec2971d7270cb433c024e615d043fb591590a39df81d8fca1a587c86e02b09c37e12aecd1292ff9198de83d6d9fc2e379
+DIST goland-2019.1.2.tar.gz 312490907 BLAKE2B 9cc0abdb9d86b1bd9cdf67e3e65548bce229d3575a62ed153435585d0d82489b193cc775341e194107cc09e4e6e2ee84f4639259c998a7191b765edb6f5695ee SHA512 fb5c597634cc2a84f2abaeae9d0a31e332ba0123d44a5cbbf1587e05cd8da0358794ab80bb873d3395385aeb87d1d92ca4dd7e606523a621fab16aeec85aaeda
diff --git a/dev-util/goland/goland-2019.1.1.ebuild b/dev-util/goland/goland-2019.1.1.ebuild
deleted file mode 100644
index 824cf5bfe3d6..000000000000
--- a/dev-util/goland/goland-2019.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2018.3.4.ebuild b/dev-util/goland/goland-2019.1.2.ebuild
similarity index 100%
rename from dev-util/goland/goland-2018.3.4.ebuild
rename to dev-util/goland/goland-2019.1.2.ebuild
diff --git a/dev-util/goland/metadata.xml b/dev-util/goland/metadata.xml
index 6f49eba8f496..474123637388 100644
--- a/dev-util/goland/metadata.xml
+++ b/dev-util/goland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index 83edb27798aa..cb9b990b3e67 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 7cd05eadac92..00553ec68307 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index 1549f142bdb8..81adbc54f739 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="
 	sys-devel/flex
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 47bbe890d59f..590d89579787 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index 24db11b7dda9..448ddcf7a87f 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
index 6479dff7982b..52e2229e678f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 4bbdfcde6b9f..7f4968287312 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index bad71b9d72b2..e14eb1d071eb 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,3 +1,3 @@
 DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.0_rc5.tar.gz 5472917 BLAKE2B 33e01bd0da0a90ff7c09b9af0ebf9f9263be3789390777ee207d2e4297a55d79d4cc7fea28aab121820fffd3447f76d9af60a9c118e541f0ff85ffe9dc17ae48 SHA512 26eb5625e1f940a1705f2d675587ce142a7b07206187c851660bf1c405e9a76c0cc20cf616d471170578f50dae2fc322b504df1ea3ef722fc5992dd9803de8fb
-DIST sway-1.1_rc2.tar.gz 5480615 BLAKE2B e54980bd23ee29e7a2d7abfcc3cb474fbe77b2e830e2a7afef0a3457ff67d683321b0fb4f4aae17d717171d6bf7d5f91ce468e090a02f8287e71fcb88717fe4c SHA512 6016d45f0812bbdc782fc81c63089431888398739c8b304b8021375a4f019f11ca8cf4bf12be07ed0d102f50c76586d1bd2b9658f6b200c1c777afc6ccc6d371
+DIST sway-1.1_rc3.tar.gz 5480553 BLAKE2B 21623ffaeca39599f83fcd3e1888bfff8b7a67cf03ba47eb6df5a9d88a857b9c9b65872925e37b95c85e63612884a7e727129a69396aacce5287545a6e9f2b3f SHA512 425c0af31ecf64e3be45fd0a8592fd3fc57127fa8f5c9bf08ec059bbb396bc83e883b08a32dce24d3de9f7027301e3e8e85f0d3e1f261f93bf66ee0d6a8fd0d0
diff --git a/gui-wm/sway/sway-1.1_rc2.ebuild b/gui-wm/sway/sway-1.1_rc3.ebuild
similarity index 100%
rename from gui-wm/sway/sway-1.1_rc2.ebuild
rename to gui-wm/sway/sway-1.1_rc3.ebuild
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a9dacb761ffa..0b355fcd19a8 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/discover/discover-5.15.5.ebuild b/kde-plasma/discover/discover-5.15.5.ebuild
index 2844c35b75d7..2bc7388a63bd 100644
--- a/kde-plasma/discover/discover-5.15.5.ebuild
+++ b/kde-plasma/discover/discover-5.15.5.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" )
 
+RESTRICT+=" test"
+
 src_prepare() {
 	kde5_src_prepare
 	# we don't need it with PackageKitBackend off
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 05a566b50549..c9672951f78c 100644
Binary files a/lxqt-base/Manifest.gz and b/lxqt-base/Manifest.gz differ
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 54b3f2a5334e..5826ec911b45 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
index e0faa44cc89c..2086a902f95c 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
index 89e05d6b229e..f2baf0b2d851 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
index af58883a5fdd..d0a88c9ac45e 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
index 838fe79c5218..868536c899a7 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
index 58173c4556db..178ff87df2bb 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
index c1ba932bbeaf..7d75d0e55022 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
index 5b510c9b2b27..419e13f11b04 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
index 93824d9adf19..17763b6c7f9a 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
index 9ef997edc34b..0cd629a8b6d7 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
index f5f9fc9a0a4b..6892d93b67fd 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
index cf344d35dcba..4d53ec798f1b 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
index a4c000ea278b..85a3927c4db6 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
index ef371efaa311..0050122820d8 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
index 91df6678fb52..cbaaeea900dc 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 IUSE="+themes +udev"
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
index f1f039457a47..67b2c25ba6e7 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 52c20bd3c4d5..7a58053470dc 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index a397e84c7375..7a659b227afb 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,6 +14,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="addressbook">Build <pkg>kde-apps/akonadi</pkg> addressbook plugin</flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 	</use>
 	<upstream>
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 268f9915e76b..7740a0aa6ff7 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
+IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,12 +34,14 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
+	addressbook? ( kde-apps/akonadi-contacts:5 )
 	crypt? (
 		>=app-crypt/gpgme-1.8.0[cxx,qt5]
 		dev-libs/mimetic
 	)
 	dbus? ( dev-qt/qtdbus:5 )
 	password? ( dev-libs/qtkeychain[qt5(+)] )
+	spell? ( kde-frameworks/sonnet:5 )
 	zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
@@ -56,12 +58,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+		-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
 		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
 		-DWITH_GPGMEPP=$(usex crypt)
 		-DWITH_MIMETIC=$(usex crypt)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-		-DWITH_TESTS=$(usex test)
+		-DWITH_SONNET_PLUGIN=$(usex spell)
+		-DBUILD_TESTING=$(usex test)
 		-DWITH_ZLIB=$(usex zlib)
 	)
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1fc048d63600..e9cea7ff9916 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 84f352f2ed79..2b21a77fe5bc 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,2 +1 @@
-DIST hugin-2018.0.0.tar.bz2 9838518 BLAKE2B dc6d786e4e6a298d4dd4e48b2c42f9c9c297b4c431fbc00fa9090f129a4633f599e222402aef1f2a467aa9b498d356f3bbaca9548954cf697d331950afa6693a SHA512 30061f4af695137f349526272e8c3c2f1f6a167305acb32466a30629c46dabea3818bc2c3a77b6102fcb67aa390a803cdc5ba8d8a2ecc6065f88726392529cbc
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
diff --git a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch b/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
deleted file mode 100644
index 23dd54289217..000000000000
--- a/media-gfx/hugin/files/hugin-2018.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/hugin_base/panodata/Exiv2Helper.cpp
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -29,6 +29,7 @@
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
- #include "exiv2/easyaccess.hpp"
-+#include "exiv2/version.hpp"
- 
- namespace HuginBase
- {
-@@ -232,7 +233,7 @@
-                     return false;
-                 };
-             };
--#if EXIV2_TEST_VERSION(0,23,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
-             if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
-                 _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
-             {
-@@ -563,7 +564,7 @@
-             std::string lensName;
-             // first we are reading LensModel in Exif section, this is only available
-             // with EXIF >= 2.3
--#if EXIV2_TEST_VERSION(0,22,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
-             //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
-             if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
- #else
diff --git a/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
new file mode 100644
index 000000000000..e22023f3998e
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2019.0.0-exiv2-0.27.1.patch
@@ -0,0 +1,29 @@
+Fix build against exiv2-0.27.1 by using upstream recommended catchall header.
+
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	2019-02-16 09:18:55.000000000 +0100
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	2019-05-21 14:26:23.470193305 +0200
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+ 
+--- a/src/hugin1/hugin/RawImport.cpp	2019-02-02 11:11:01.000000000 +0100
++++ b/src/hugin1/hugin/RawImport.cpp	2019-05-21 14:33:00.522541182 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
deleted file mode 100644
index 5c87262440f2..000000000000
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
-IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
-
-CDEPEND="
-	!!dev-util/cocom
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/zthread
-	>=media-gfx/enblend-4.0
-	media-gfx/exiv2:=
-	media-libs/freeglut
-	media-libs/glew:=
-	>=media-libs/libpano13-2.9.19_beta1:0=
-	media-libs/libpng:0=
-	media-libs/openexr:=
-	media-libs/tiff:0
-	>=media-libs/vigra-1.11.0[openexr]
-	sci-libs/fftw:3.0=
-	sci-libs/flann
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/wxGTK:3.0=[X,opengl]
-	lapack? ( virtual/blas virtual/lapack )
-	python? ( ${PYTHON_DEPS} )
-	sift? ( media-gfx/autopano-sift-C )"
-RDEPEND="${CDEPEND}
-	media-libs/exiftool"
-DEPEND="${CDEPEND}
-	dev-cpp/tclap
-	sys-devel/gettext
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0.4 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( authors.txt README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HSI=$(usex python)
-		-DENABLE_LAPACK=$(usex lapack)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-
-	local lang
-	for lang in ${LANGS} ; do
-		case ${lang} in
-			ca) dir=ca_ES;;
-			ca-valencia) dir=ca_ES@valencia;;
-			cs) dir=cs_CZ;;
-			*) dir=${lang/-/_};;
-		esac
-		if ! use l10n_${lang} ; then
-			rm -r "${ED%/}"/usr/share/locale/${dir} || die
-		fi
-	done
-}
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index 543908d5bca7..65ee4e79249f 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -56,6 +56,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 686366
+
 S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
 
 pkg_setup() {
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0783740a35d3..5ec24c68ade6 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 WX_GTK_VER="3.0"
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver
+inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
 DESCRIPTION="GUI for the creation & processing of panoramic images"
 HOMEPAGE="http://hugin.sf.net"
@@ -64,6 +64,10 @@ pkg_setup() {
 	setup-wxwidgets
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 7e74167d0fd4..0caf4e8a3cb2 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 2238a60f8640..1af0862f0c6d 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,17 +12,24 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
+IUSE="mpi"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	>=dev-libs/boost-1.62:=
 	>=media-libs/ilmbase-2.2.0:=
 	sci-libs/hdf5:=
-	virtual/mpi"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" )
-
-# Docs are not finished yet.
-mycmakeargs=( -DINSTALL_DOCS=OFF )
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_DOCS=OFF # Docs are not finished yet.
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+		$(cmake-utils_use_find_package mpi MPI)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e28b746003b9..66b0e77d0032 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
index 3930ee7f2a6a..b3470e443768 100644
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index c915edd64d49..1e9ad62b0772 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,2 +1 @@
-DIST codec2-0.7.tar.xz 8386048 BLAKE2B 04e2ab834539d6911300d30a7de00a0c351e29c53972482765cbefefe8d9e0f10b491496690e34beacce27f68da0c85bb6ad8bb75b93ce50e44eb13f1ad8070b SHA512 bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af
 DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
diff --git a/media-libs/codec2/codec2-0.7.ebuild b/media-libs/codec2/codec2-0.7.ebuild
deleted file mode 100644
index c50c30e8bd4c..000000000000
--- a/media-libs/codec2/codec2-0.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Low bit rate speech codec"
-HOMEPAGE="https://freedv.org/"
-SRC_URI="https://freedv.com/wp-content/uploads/sites/8/2017/10/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=( -DUNITTEST=OFF )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 3a2fd2c8d49f..f220838eef34 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
 DEPEND=""
diff --git a/media-libs/gavl/Manifest b/media-libs/gavl/Manifest
index a18023765498..8665e096c4ae 100644
--- a/media-libs/gavl/Manifest
+++ b/media-libs/gavl/Manifest
@@ -1,2 +1 @@
-DIST gavl-1.2.0.tar.gz 4589139 BLAKE2B 9e99aa41128690f580ed023de07a449a101a15549e39f77e89dbf08c0eddd6db691d2bd5b50ad64b2be293d6c4cbf6a1d9157a9cc8d4749c7a5118c15cb9fdd4 SHA512 fe3b7ed91b8564e7f61b738f29ea439af462c1e28038ee04f5b8fc82d7fd6270acd7d1dd54c717f289bba181bafe9c3ec6156449d95153d9fd43e18a92a60c41
 DIST gavl-1.4.0.tar.gz 4592701 BLAKE2B 2ed47cf63d8ce3424d0714e202a11ecef89c5a9c160a6045e238bae4179c02398600fc9c6d914784bb24a86c501f93971631461bdecaa8a70743a674748a2ec3 SHA512 beda0073cab865fdb3a55de5d5c800fabcd40b21c5bb5b5f9d43046db3602d8967fb8b893325fcdaca3fa66d978aa3cae79a4a797d43d40ad50ea5af752a650a
diff --git a/media-libs/gavl/gavl-1.2.0.ebuild b/media-libs/gavl/gavl-1.2.0.ebuild
deleted file mode 100644
index 2715afa75886..000000000000
--- a/media-libs/gavl/gavl-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-# pkg-config is only here to satisfy autotools-utils.eclass wrt #432796
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gavl/gavl-1.4.0.ebuild b/media-libs/gavl/gavl-1.4.0.ebuild
deleted file mode 100644
index b839782daa1c..000000000000
--- a/media-libs/gavl/gavl-1.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="library for handling uncompressed audio and video data"
-HOMEPAGE="http://gmerlin.sourceforge.net"
-SRC_URI="mirror://sourceforge/gmerlin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# AC_CONFIG_HEADERS, bug #467736
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:-mfpmath=387::g' \
-		-e 's:-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math::g' \
-		-e '/LDFLAGS=/d' \
-		configure.ac || die
-
-	export AT_M4DIR="m4"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# --disable-libpng because it's only used for tests
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-libpng
-		$(use_with doc doxygen)
-		--without-cpuflags
-		)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index c2edf7ba2070..e362bcdfb688 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index ff8e259b2842..79dfca06e6ff 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
index c4e2b5ed7110..9f02cbc7f8aa 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
index 7d21188671ad..05b3cc07cca1 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 3914dcc0ccbc..7bb095742b0f 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test unwind"
 
 RDEPEND="
diff --git a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
index 5c63f0e17bee..31a03baf4c39 100644
--- a/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
+++ b/media-libs/lensfun/lensfun-0.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libaom/libaom-1.0.0-r1.ebuild b/media-libs/libaom/libaom-1.0.0-r1.ebuild
index 33f1019f49ff..3dd2b5c6462e 100644
--- a/media-libs/libaom/libaom-1.0.0-r1.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..cb5ffad0646e
--- /dev/null
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+	if [[ ${PV} == *pre* ]]; then
+		SRC_URI="mirror://gentoo/${P}.tar.xz"
+		S="${WORKDIR}/${PN}"
+	else
+		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="mirror://gentoo/${P}.tar.gz"
+		S="${WORKDIR}"
+	fi
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/0"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+	abi_x86_64? ( dev-lang/yasm )
+	abi_x86_x32? ( dev-lang/yasm )
+	x86-fbsd? ( dev-lang/yasm )
+	amd64-fbsd? ( dev-lang/yasm )
+	doc? ( app-doc/doxygen )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/libdirpc2.patch"
+	"${FILESDIR}/pthread_lib2.patch"
+	"${FILESDIR}/${P}-version.patch"
+	"${FILESDIR}/${P}-armv7l.patch"
+)
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+src_prepare() {
+	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+		-DENABLE_NASM=OFF
+		-DENABLE_TOOLS=ON
+		-DENABLE_WERROR=OFF
+
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
+		# ENABLE_DSPR2 / ENABLE_MSA for mips
+		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake-utils_src_configure
+	rm aom.pc # ensure it is rebuilt with proper libdir
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	if multilib_is_native_abi && use doc ; then
+		docinto html
+		dodoc docs/html/*
+	fi
+}
diff --git a/media-libs/lilv/lilv-0.24.2-r2.ebuild b/media-libs/lilv/lilv-0.24.2-r2.ebuild
index 6f7029f64c58..ca54e0e874c6 100644
--- a/media-libs/lilv/lilv-0.24.2-r2.ebuild
+++ b/media-libs/lilv/lilv-0.24.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc x86"
 IUSE="doc +dyn-manifest static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
index e5aff379a1eb..4e83f368f3aa 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86"
 IUSE="doc plugins"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 340ed2b26829..de61a6c6d410 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,5 +2,7 @@ DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d0
 DIST mesa-19.0.2.tar.xz 11959876 BLAKE2B 4d82a339a1577fb156b48d330157894891326f36cb265421453a5fde5086ee05f83962fde49113f34917f750cfffb40c8bce84bd003fe9d7c1e6900c52dc4d66 SHA512 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51
 DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0
 DIST mesa-19.0.4.tar.xz 11964060 BLAKE2B 5c0d0c6e019792ff6cd195f3b59303e2230fa32c24aa1524c3cccddc56ef6634732e79ff03c7bb20055c0489dbdd7cc103b27989179602f3c9ab332afd531d1a SHA512 431cd9360e1f6376e0966daf82322877b3833032c800f2d86816b37a6f3978d76294a01c3905a01af610582c9541c2a8b52b2e89c56cc954651aa7a790e84ca5
+DIST mesa-19.0.5.tar.xz 11967816 BLAKE2B 941f99194492fcdf4545d06d4f2d576a1a2b206aa9211dd8c3a018877a42dfac4a6d7b4103e781e4c4211661c118b663225252567e22226a866386a8e242f177 SHA512 aecd5ee54ac0316d5e318dbea0abdc06f23e67d75d36eb82d6cf6a396c9e850e1ccf4fa8815f8c4097b6039ebb1524673189350cbfd4b766ce75ce17c26d9d8d
 DIST mesa-19.1.0-rc1.tar.xz 10877180 BLAKE2B 1ea358595875fbe46b58f5445762cec0c0bd6ee087ce9819237373e2b41aacb64365ac9832b20b9f5fb8838c3d2c6c929cd642bba18b99c7ef153ca124135918 SHA512 a56215882a7c22b7b8fe57d5703914d674841e4045676e2cc2e7834d17f4d5a765516bec4f01eea6772c50e1d979cc430e032302f38c6e7a4274bc43a4d647b1
 DIST mesa-19.1.0-rc2.tar.xz 10876808 BLAKE2B 2da9603ea7ec5c1de94ee24c3200f570e4ea127601f370230dc1bf1b64167c6d405fbd6bdb4cdae6be46ed0ff1610f12c0445c3f5a65dd6559e91b6f664872ca SHA512 4d04bec48cbfb17d6dbe7b7700083612e46cbaad3e3630d6219fd1988f5e793cdb5100b8c2531a94b6078f8bb239fef27ed440122d12a2473be5be8648b6a8b1
+DIST mesa-19.1.0-rc3.tar.xz 10878280 BLAKE2B 0b95b82d46a2c72185652fef76a50ec82b51a2f8efa9ca72e2c10eb0443e9ba43c5906de37d2479dc97ed48a8932eebea27de7e08321d7d3205b188af9f64642 SHA512 740d5d13458b54e1942bfe7165938ec414aa7949aa60109ba872236f3b483c7305ac76b1b48c38dc6fd7691748106447757ac081f364952cc9e00f45fa9e2ea5
diff --git a/media-libs/mesa/mesa-19.0.5.ebuild b/media-libs/mesa/mesa-19.0.5.ebuild
new file mode 100644
index 000000000000..6e5cc0499b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-19.0.5.ebuild
@@ -0,0 +1,525 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_imx?    ( gallium video_cards_vivante )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_imx imx
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-19.1.0_rc3.ebuild b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
new file mode 100644
index 000000000000..20146f77c705
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.0_rc3.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	EXPERIMENTAL="true"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	valgrind? ( dev-util/valgrind )
+	x11-base/xorg-proto
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.0.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm_sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		emesonargs+=( -Dasm=false )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=dri
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
index eef7acdfcb65..14dc6a02e0b5 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-8.1.24.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..6658b6af7997
--- /dev/null
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
+HOMEPAGE="https://opus-codec.org/"
+SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
+IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
+
+DEPEND="doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable custom-modes)
+		$(use_enable doc)
+		$(use_enable static-libs static)
+	)
+	for i in ${INTRINSIC_FLAGS} ; do
+		use ${i} && myeconfargs+=( --enable-intrinsics )
+	done
+	if is-flagq -ffast-math || is-flagq -Ofast; then
+		myeconfargs+=( "--enable-float-approx" )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index f7c5d0f3e48d..439468d5e6e7 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,2 +1,3 @@
 DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
 DIST ptex-2.3.0.tar.gz 306462 BLAKE2B 790e3623ce6ebae2dfd8884d8e19e62395c54432289d88bdcf3a01c8ae1ef752ca88869357ac1e4657d59f1ca73d311a3fb9a08efe4e145ca259eff93d8a3b6a SHA512 2d9d320e4205236a4eff05ec3c67d085624809ebefa89fa3b943d18a8b2b6a5f61c022a4cc4363a7c6ceccfb9eac4f8738dff2e90a3355814f2c4ff096c09992
+DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
diff --git a/media-libs/ptex/files/ptex-2.3.2-cxx11.patch b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
new file mode 100644
index 000000000000..f35372b7c636
--- /dev/null
+++ b/media-libs/ptex/files/ptex-2.3.2-cxx11.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2019-03-08 18:39:47.000000000 +0100
++++ b/CMakeLists.txt	2019-05-21 23:20:50.964082298 +0200
+@@ -5,19 +5,6 @@
+ option(PTEX_BUILD_SHARED_LIBS "Enable building Ptex shared libraries" ON)
+ option(PRMAN_15_COMPATIBLE_PTEX "Enable PRMan 15 compatibility" OFF)
+ 
+-if (DEFINED ENV{CXXFLAGS_STD})
+-    if ($ENV{CXXFLAGS_STD} STREQUAL "c++17")
+-        set(CMAKE_CXX_STANDARD 17)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++14")
+-        set(CMAKE_CXX_STANDARD 14)
+-    elseif ($ENV{CXXFLAGS_STD} STREQUAL "c++11")
+-        set(CMAKE_CXX_STANDARD 11)
+-    else ()
+-        set(CMAKE_CXX_STANDARD 98)
+-    endif ()
+-else ()
+-    set(CMAKE_CXX_STANDARD 98)
+-endif ()
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS ON)
+ set(CMAKE_INSTALL_MESSAGE LAZY) # Silence "Up-to-date:" install messages
diff --git a/media-libs/ptex/ptex-2.1.28.ebuild b/media-libs/ptex/ptex-2.1.28.ebuild
deleted file mode 100644
index b766367ac446..000000000000
--- a/media-libs/ptex/ptex-2.1.28.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
-HOMEPAGE="http://ptex.us/"
-SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild
new file mode 100644
index 000000000000..b9d0f650ba96
--- /dev/null
+++ b/media-libs/ptex/ptex-2.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
+HOMEPAGE="http://ptex.us/"
+SRC_URI="https://github.com/wdas/ptex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="app-doc/doxygen"
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
+
+src_prepare() {
+	# https://github.com/wdas/ptex/issues/41
+	cat <<-EOF > version || die
+	${PV}
+	EOF
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
+		-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 2f77ba341816..d5f5f8bf1681 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index e82dc65f00e5..c689277ebe91 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=media-libs/lv2-1.14.0-r1
diff --git a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
index e763c5eb15a6..73c4cebaad8e 100644
--- a/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="X doc static-libs"
 
 RDEPEND="X? (
diff --git a/media-libs/woff2/woff2-1.0.2-r1.ebuild b/media-libs/woff2/woff2-1.0.2-r1.ebuild
index fc7de30c353b..7b44c261487b 100644
--- a/media-libs/woff2/woff2-1.0.2-r1.ebuild
+++ b/media-libs/woff2/woff2-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND="app-arch/brotli"
diff --git a/media-libs/zimg/files/zimg-2.7.5-sse2.patch b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
new file mode 100644
index 000000000000..77483ab59e73
--- /dev/null
+++ b/media-libs/zimg/files/zimg-2.7.5-sse2.patch
@@ -0,0 +1,231 @@
+From e30112df0ca703be82ed2c852511916fc46defbd Mon Sep 17 00:00:00 2001
+From: sekrit-twc <noreply@example.com>
+Date: Fri, 22 Mar 2019 18:51:14 -0700
+Subject: [PATCH] colorspace: use bfloat16 for SSE2 linear-to-gamma LUT
+
+On Skylake, processing 512 pixel array:
+
+direction	cycles/sample	cycles/pxvector
+     g->l	         2.35	           9.43
+     l->g	         2.49	           9.97
+---
+ .../colorspace/x86/operation_impl_avx2.cpp    |   3 +-
+ .../colorspace/x86/operation_impl_sse2.cpp    | 104 ++++++++++++++++--
+ test/colorspace/x86/colorspace_sse2_test.cpp  |  14 +--
+ 3 files changed, 100 insertions(+), 21 deletions(-)
+
+diff --git a/src/zimg/colorspace/x86/operation_impl_avx2.cpp b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+index bbbbf896..f0e7f792 100644
+--- a/src/zimg/colorspace/x86/operation_impl_avx2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_avx2.cpp
+@@ -114,8 +114,7 @@ class ToGammaLutOperationAVX2 final : public Operation {
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+-		// Allocate an extra LUT entry so that indexing can be done by multipying by a power of 2.
+-		for (unsigned long i = 0; i <= UINT16_MAX; ++i) {
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
+ 			uint16_t half = static_cast<uint16_t>(i);
+ 			float x = _mm_cvtss_f32(_mm_cvtph_ps(_mm_set1_epi16(half)));
+ 			m_lut[i] = func(x * prescale);
+diff --git a/src/zimg/colorspace/x86/operation_impl_sse2.cpp b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+index 48645031..da9d4dbc 100644
+--- a/src/zimg/colorspace/x86/operation_impl_sse2.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_sse2.cpp
+@@ -3,11 +3,13 @@
+ #include <algorithm>
+ #include <cstddef>
+ #include <cstdint>
++#include <type_traits>
+ #include <vector>
+ #include <emmintrin.h>
+ #include "common/align.h"
+ #include "common/ccdep.h"
+ #include "common/make_unique.h"
++#include "common/x86/sse2_util.h"
+ #include "colorspace/gamma.h"
+ #include "colorspace/operation.h"
+ #include "colorspace/operation_impl.h"
+@@ -20,14 +22,25 @@ namespace {
+ 
+ constexpr unsigned LUT_DEPTH = 16;
+ 
+-void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float prescale, const float *src, float *dst, unsigned left, unsigned right)
++template <class T, class U>
++T bit_cast(const U &x) noexcept
++{
++	static_assert(sizeof(T) == sizeof(U), "object sizes must match");
++	static_assert(std::is_pod<T>::value && std::is_pod<U>::value, "object types must be POD");
++
++	T ret;
++	std::copy_n(reinterpret_cast<const char *>(&x), sizeof(x), reinterpret_cast<char *>(&ret));
++	return ret;
++}
++
++void to_linear_lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, const float *src, float *dst, unsigned left, unsigned right)
+ {
+ 	unsigned vec_left = ceil_n(left, 4);
+ 	unsigned vec_right = floor_n(right, 4);
+ 
+ 	const int32_t lut_limit = static_cast<int32_t>(1) << lut_depth;
+ 
+-	const __m128 scale = _mm_set_ps1(0.5f * prescale * lut_limit);
++	const __m128 scale = _mm_set_ps1(0.5f * lut_limit);
+ 	const __m128 offset = _mm_set_ps1(0.25f * lut_limit);
+ 	const __m128i limit = _mm_set1_epi16(std::min(lut_limit + INT16_MIN, static_cast<int32_t>(INT16_MAX)));
+ 	const __m128i bias_epi16 = _mm_set1_epi16(INT16_MIN);
+@@ -73,16 +86,61 @@ void lut_filter_line(const float *RESTRICT lut, unsigned lut_depth, float presca
+ 	}
+ }
+ 
++void to_gamma_lut_filter_line(const float *RESTRICT lut, const float *src, float *dst, unsigned left, unsigned right)
++{
++	unsigned vec_left = ceil_n(left, 4);
++	unsigned vec_right = floor_n(right, 4);
++
++	for (unsigned j = left; j < vec_left; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++	for (unsigned j = vec_left; j < vec_right; j += 4) {
++		__m128i x = _mm_castps_si128(_mm_load_ps(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++#if SIZE_MAX >= UINT64_MAX
++		uint64_t tmp = _mm_cvtsi128_si64(x);
++		dst[j + 0] = lut[tmp & 0xFFFFU];
++		dst[j + 1] = lut[(tmp >> 16) & 0xFFFFU];
++		dst[j + 2] = lut[(tmp >> 32) & 0xFFFFU];
++		dst[j + 3] = lut[tmp >> 48];
++#else
++		uint32_t tmp0 = _mm_cvtsi128_si32(x);
++		uint32_t tmp1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(x, _MM_SHUFFLE(3, 2, 0, 1)));
++		dst[j + 0] = lut[tmp0 & 0xFFFFU];
++		dst[j + 1] = lut[tmp0 >> 16];
++		dst[j + 2] = lut[tmp1 & 0xFFFFU];
++		dst[j + 3] = lut[tmp1 >> 16];
++#endif
++	}
++	for (unsigned j = vec_right; j < right; ++j) {
++		__m128i x = _mm_castps_si128(_mm_load_ss(src + j));
++		__m128i msb = _mm_srli_epi32(x, 16);
++		__m128i lsb = _mm_and_si128(_mm_srli_epi32(x, 15), _mm_set1_epi32(1));
++		x = mm_packus_epi32(msb, lsb);
++		x = _mm_adds_epi16(x, _mm_shuffle_epi32(x, _MM_SHUFFLE(1, 0, 3, 2)));
++
++		dst[j] = lut[_mm_cvtsi128_si32(x)];
++	}
++}
++
+ 
+-class LutOperationSSE2 final : public Operation {
++class ToLinearLutOperationSSE2 final : public Operation {
+ 	std::vector<float> m_lut;
+ 	unsigned m_lut_depth;
+-	float m_prescale;
+ public:
+-	LutOperationSSE2(gamma_func func, unsigned lut_depth, float prescale, float postscale) :
++	ToLinearLutOperationSSE2(gamma_func func, unsigned lut_depth, float postscale) :
+ 		m_lut((1UL << lut_depth) + 1),
+-		m_lut_depth{ lut_depth },
+-		m_prescale{ static_cast<float>(prescale) }
++		m_lut_depth{ lut_depth }
+ 	{
+ 		EnsureSinglePrecision x87;
+ 
+@@ -95,9 +153,31 @@ class LutOperationSSE2 final : public Operation {
+ 
+ 	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
+ 	{
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[0], dst[0], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[1], dst[1], left, right);
+-		lut_filter_line(m_lut.data(), m_lut_depth, m_prescale, src[2], dst[2], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[0], dst[0], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[1], dst[1], left, right);
++		to_linear_lut_filter_line(m_lut.data(), m_lut_depth, src[2], dst[2], left, right);
++	}
++};
++
++class ToGammaLutOperationSSE2 final : public Operation {
++	std::vector<float> m_lut;
++public:
++	ToGammaLutOperationSSE2(gamma_func func, float prescale) :
++		m_lut(static_cast<uint32_t>(UINT16_MAX) + 1)
++	{
++		EnsureSinglePrecision x87;
++
++		for (size_t i = 0; i <= UINT16_MAX; ++i) {
++			float x = bit_cast<float>(static_cast<uint32_t>(i << 16));
++			m_lut[i] = func(x * prescale);
++		}
++	}
++
++	void process(const float * const *src, float * const *dst, unsigned left, unsigned right) const override
++	{
++		to_gamma_lut_filter_line(m_lut.data(), src[0], dst[0], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[1], dst[1], left, right);
++		to_gamma_lut_filter_line(m_lut.data(), src[2], dst[2], left, right);
+ 	}
+ };
+ 
+@@ -109,7 +189,7 @@ std::unique_ptr<Operation> create_gamma_operation_sse2(const TransferFunction &t
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_gamma, LUT_DEPTH, transfer.to_gamma_scale, 1.0f);
++	return ztd::make_unique<ToGammaLutOperationSSE2>(transfer.to_gamma, transfer.to_gamma_scale);
+ }
+ 
+ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFunction &transfer, const OperationParams &params)
+@@ -117,7 +197,7 @@ std::unique_ptr<Operation> create_inverse_gamma_operation_sse2(const TransferFun
+ 	if (!params.approximate_gamma)
+ 		return nullptr;
+ 
+-	return ztd::make_unique<LutOperationSSE2>(transfer.to_linear, LUT_DEPTH, 1.0f, transfer.to_linear_scale);
++	return ztd::make_unique<ToLinearLutOperationSSE2>(transfer.to_linear, LUT_DEPTH, transfer.to_linear_scale);
+ }
+ 
+ } // namespace colorspace
+diff --git a/test/colorspace/x86/colorspace_sse2_test.cpp b/test/colorspace/x86/colorspace_sse2_test.cpp
+index d5130868..ecaa05e7 100644
+--- a/test/colorspace/x86/colorspace_sse2_test.cpp
++++ b/test/colorspace/x86/colorspace_sse2_test.cpp
+@@ -53,9 +53,9 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"162687e701627cdc17283a32c36ea711d28a953e"
+ 		},
+ 		{
+-			"492587e7ed75b7e3ab868bead6ade7a4137c6ea1",
+-			"3b0694e9fbce61466cb5a575f300d784089b6cad",
+-			"b68f103f52ccafae867d664d7f27fe56ae9208af"
++			"95f2715bd0d417028bebd5c5377180fcd5b01119",
++			"76f7c88b198f1ab08167f8162c1237b54f22007a",
++			"1099c3ae187c0a9f79acb9445761b6056218c779"
+ 		},
+ 		{
+ 			"4c0b5ffe768a7812d1ef102b4d8d52614838bc8e",
+@@ -63,13 +63,13 @@ TEST(ColorspaceConversionSSE2Test, test_transfer_lut)
+ 			"85a277a80dfca2e21789cedd76aaee307dbc4562"
+ 		},
+ 		{
+-			"df546ce0ad6f859499a96d2d697d896067e60e38",
+-			"f0041b8a008ab45f0ea1319090ac7e8be0990d92",
+-			"06880efb598e41f96fa79e04dbdfcccd50d6dc6f"
++			"5e35786d313e936566d9873ba7a08a8d6005b2ee",
++			"829fa88acfbbb26801871bf3cadf5cc2eb6830c9",
++			"f82fcad18a19b548d419a1952b6a7a423a684b62"
+ 		},
+ 	};
+ 	const double expected_tolinear_snr = 80.0;
+-	const double expected_togamma_snr = 40.0;
++	const double expected_togamma_snr = 60.0;
+ 
+ 	SCOPED_TRACE("tolinear 709");
+ 	test_case({ MatrixCoefficients::RGB, TransferCharacteristics::REC_709, ColorPrimaries::UNSPECIFIED },
diff --git a/media-libs/zimg/zimg-2.7.5.ebuild b/media-libs/zimg/zimg-2.7.5.ebuild
index 93b521bee179..7bac59befc36 100644
--- a/media-libs/zimg/zimg-2.7.5.ebuild
+++ b/media-libs/zimg/zimg-2.7.5.ebuild
@@ -1,36 +1,33 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
-
-inherit autotools-multilib ${SCM}
+inherit autotools multilib-minimal
 
 DESCRIPTION="Scaling, colorspace conversion, and dithering library"
 HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-sse2.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
index fe1991fc9e05..d20d4bf58406 100644
--- a/media-libs/zimg/zimg-9999.ebuild
+++ b/media-libs/zimg/zimg-9999.ebuild
@@ -1,36 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=yes
-
-SCM=""
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
-
-inherit autotools-multilib ${SCM}
+inherit autotools multilib-minimal
 
 DESCRIPTION="Scaling, colorspace conversion, and dithering library"
 HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
-if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-release-${PV}/"
-fi
-
 LICENSE="WTFPL-2"
 SLOT="0"
 IUSE="static-libs cpu_flags_x86_sse"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_prepare() {
+	default
+	eautoreconf
+}
 
-src_configure() {
-	autotools-multilib_src_configure \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable cpu_flags_x86_sse x86simd)
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5e8900d272eb..27a3ae24528f 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
index 38c256254329..e7d55b9dc145 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.14.4.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-bad is build with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
index e9c44dd1b7b1..86f21eee403c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
index 59461a36ff53..69a7f7b47231 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.14.4-r1.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 02aa1b52fd07..dcb6c70240f9 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f9b5e3550406..e55ce468aa83 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,3 +3,4 @@ DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d5
 DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
 DIST mpd-0.21.8.tar.xz 670508 BLAKE2B 04df23007e5cedd00259b1d5f7d301c36b52993ce8352bf784c794150340e4bf2d0a606eb02de3abedcbb9a76f01aca9dc9191d95efd49d0868a32af385821d2 SHA512 034f1cfe431ce163ed808660bee90c2a63926fcc95ab22f55fd566f24c126878fe0fd6521f3008612ea5dca7b448cc5e5d895e0b0156c768bf632674ea982901
+DIST mpd-0.21.9.tar.xz 671092 BLAKE2B 87e1d8afe42b4ca59b1aa47cc0f6260af2d1c161928411cefdcd1f9e6c1013869cffccd729d2cefcc4ddff4fde18bab887407b1b71c6c46457c930c7802f3337 SHA512 e4c5561df881874a16716b32bc1381b6e3bd3690eac07cf3923d1e273937b9594cf387d1e1aa3b02c7f0d19bd30c4575f43863e11d9a69b6a647205009593a9e
diff --git a/media-sound/mpd/mpd-0.21.9.ebuild b/media-sound/mpd/mpd-0.21.9.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.9.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index 834f17c16d20..b912f2ecb4f1 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 3b8939341599..5fac2cc0599f 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
-DIST pulseeffects-4.6.0.tar.gz 1831433 BLAKE2B a5eda0e6880f8a3e62ad62b5e1ed3b5b44118d3ac14821f786532f567974fd40e78f0b4c4a7c51851bb48b94694bf473fe0996e7fb361db0c50b00a467b9c949 SHA512 acadff43f35f7ac5f5028e87efb1c8c0d4d8ed97d367b53fd231475243735ac149d8c1aac9c86281ec9a661814a665f67d43f7fc0d7e591b19524b5cb2124f92
+DIST pulseeffects-4.6.1.tar.gz 1878597 BLAKE2B 5db87915f5e008780bc063580cee95202460f9932533d4227eec89ba49d8ba760d2be44e0268d53279868b07da1556ddae648ff6339cc10304a0c429a8d55eb9 SHA512 336ab9c3a2987a8ca0887fd87c836776619e6989c22bb7442c7e6f3d8603537ea2789e012fea11c142dd943d0a670549fcbfff69949cacbda2621e2da95456b3
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
similarity index 100%
rename from media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
rename to media-sound/pulseeffects/pulseeffects-4.6.1.ebuild
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 892b152eda53..db29d142ca85 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index 12b71fa688bb..907398cc03c3 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 0d9b65ce7bf5..7fbe17c6f4b0 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,3 +1,3 @@
-DIST smplayer-18.10.0.tar.bz2 5167524 BLAKE2B e6c1993057f9249cb0677643816744c3a7e44bdd70865b21bc5d69d6f087c03be53fa01057ac75c42d74a00a6d5b5f6e8be4e6955ffe022196c45bba218becc2 SHA512 7726294c16761900b384db42155a26891f9becae38ef39b35dd9c6a62c2050b5720a8b641a893b33c7bc08a5c98e12a4651196a67311444d6cbed2dbd5895f5c
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.1.0.tar.bz2 5169546 BLAKE2B fc15fd33522f137371442696b20ed695dbc4cfeb759ae504cdc688dc30de14fd35da81f6788b3dc2886119012416218f1d39ba64a7d747194dd777544a08d1e0 SHA512 aee009f0ff6dcfe8e5b0b80c99d44c41a02c34d7974c1a15b21235e3daaf3142f5c936adb043327804412309b88e0ff8f0ef440c1835541adb6bf703d486ff79
+DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
diff --git a/media-video/smplayer/smplayer-19.1.0.ebuild b/media-video/smplayer/smplayer-19.1.0.ebuild
deleted file mode 100644
index 23bf31eaf0a1..000000000000
--- a/media-video/smplayer/smplayer-19.1.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.15.0[libass,X]
-			>=net-misc/youtube-dl-2014.11.26
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/smplayer/smplayer-18.10.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
similarity index 87%
rename from media-video/smplayer/smplayer-18.10.0.ebuild
rename to media-video/smplayer/smplayer-19.5.0.ebuild
index 23bf31eaf0a1..a7d7dc8f6ecf 100644
--- a/media-video/smplayer/smplayer-18.10.0.ebuild
+++ b/media-video/smplayer/smplayer-19.5.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2007-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
 he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
 sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
 PLOCALE_BACKUP="en_US"
 
-inherit gnome2-utils l10n qmake-utils toolchain-funcs xdg-utils
+inherit l10n qmake-utils toolchain-funcs xdg
 
 DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
 HOMEPAGE="https://www.smplayer.eu/"
@@ -19,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="autoshutdown bidi debug mpris"
 
-COMMON_DEPEND="
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5=
 	dev-qt/qtnetwork:5[ssl]
@@ -31,16 +32,10 @@ COMMON_DEPEND="
 	autoshutdown? ( dev-qt/qtdbus:5 )
 	mpris? ( dev-qt/qtdbus:5 )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	|| (
+		media-video/mpv[libass,X]
 		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.15.0[libass,X]
-			>=net-misc/youtube-dl-2014.11.26
-		)
 	)
 "
 
@@ -123,12 +118,17 @@ src_install() {
 	default
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
+
+	elog "If you want URL support with media-video/mpv, please install"
+	elog "net-misc/youtube-dl."
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a5e29dea58d2..b489f27b5e09 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 aeec1bf6fbaa..9f3cd35d78db 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 20 May 2019 20:38:47 +0000
+Wed, 22 May 2019 15:08:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index aeec1bf6fbaa..9f3cd35d78db 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 20 May 2019 20:38:47 +0000
+Wed, 22 May 2019 15:08:51 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index c15dfc8386e0..7d6be6a3ff5d 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 86920efec09e..b777d528485c 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.39 b/metadata/md5-cache/app-admin/apache-tools-2.4.39
index a2ea44d73d05..8bbf6a4b0c25 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.39
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.39
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.39.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4538dd52daef91560f206d799f3a82e8
+_md5_=42240db232b78fe20b574ccc8b13f8e8
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 339458ff2d7e..79eef1f4bef0 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.10 b/metadata/md5-cache/app-backup/borgbackup-1.1.10
new file mode 100644
index 000000000000..79ea3f3c9d62
--- /dev/null
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.10
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
+EAPI=7
+HOMEPAGE=https://borgbackup.readthedocs.io/
+IUSE=libressl python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.10.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5bb6c494121e9e09a3a1af5dcc4d7b70
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.9 b/metadata/md5-cache/app-backup/borgbackup-1.1.9
index f4791185bff6..2bf5490559e8 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.9
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.9
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
 EAPI=7
 HOMEPAGE=https://borgbackup.readthedocs.io/
 IUSE=libressl python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.9.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4194e9b811c75bd5e9b7b09b049fc5e5
+_md5_=5bb6c494121e9e09a3a1af5dcc4d7b70
diff --git a/metadata/md5-cache/app-backup/dar-2.6.1 b/metadata/md5-cache/app-backup/dar-2.6.3
similarity index 86%
rename from metadata/md5-cache/app-backup/dar-2.6.1
rename to metadata/md5-cache/app-backup/dar-2.6.3
index 35f00948d2c6..be043b52b1aa 100644
--- a/metadata/md5-cache/app-backup/dar-2.6.1
+++ b/metadata/md5-cache/app-backup/dar-2.6.3
@@ -1,5 +1,6 @@
+BDEPEND=nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
 DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) nls? ( sys-devel/gettext virtual/libintl ) doc? ( app-doc/doxygen )
+DEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) ) static? ( app-arch/bzip2[static-libs] app-arch/xz-utils[static-libs] sys-libs/libcap[static-libs] sys-libs/zlib[static-libs] curl? ( net-misc/curl[static-libs] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs] ) gpg? ( app-crypt/gpgme[static-libs] dev-libs/libassuan[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( dev-libs/lzo[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
 DESCRIPTION=A full featured backup tool, aimed for disks
 EAPI=7
 HOMEPAGE=http://dar.linux.free.fr/
@@ -10,6 +11,6 @@ RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:=
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://sourceforge/dar/dar-2.6.1.tar.gz
+SRC_URI=mirror://sourceforge/dar/dar-2.6.3.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=529b9c141d73c54d1ffa1995cb5e0734
+_md5_=9b9512e0b31350030ade5d097a43eb2d
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index e6f524bc846e..a0d8d5b6ad51 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.98 b/metadata/md5-cache/app-benchmarks/bonnie++-1.98
new file mode 100644
index 000000000000..40584c854c1e
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.98
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Hard drive bottleneck testing benchmark suite
+EAPI=7
+HOMEPAGE=https://www.coker.com.au/bonnie++/
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.coker.com.au/bonnie++/bonnie++-1.98.tgz
+_md5_=548e18866c7db750303d888c914a6e66
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index e25dbc753d43..fb8a6ddfb78a 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/gcr-3.28.1 b/metadata/md5-cache/app-crypt/gcr-3.28.1
index feb27bd79488..ad6d7d1a1829 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.28.1
+++ b/metadata/md5-cache/app-crypt/gcr-3.28.1
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
 IUSE=debug gtk +introspection +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.28/gcr-3.28.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6b72707b4cd1740c4f1b89d068f67b7f
+_md5_=4cf164ee558c7df7c716d74253e69c15
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.8 b/metadata/md5-cache/app-crypt/libsecret-0.18.8
index fa4d793480e4..326d7c65e8d9 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.8
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.8
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.8.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=98fe20debc462bc562e41680de29f111
+_md5_=c34b887d88a5758ee4233ff1cb46ec21
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 4b3313dc65fa..8b3db8c82402 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/libvirt-4.9.0 b/metadata/md5-cache/app-emulation/libvirt-4.9.0
index 31ec5444d313..7a18857562c3 100644
--- a/metadata/md5-cache/app-emulation/libvirt-4.9.0
+++ b/metadata/md5-cache/app-emulation/libvirt-4.9.0
@@ -11,4 +11,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml vi
 SLOT=0/4.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-4.9.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e516028b998096d0111cc2a0b77b38e6
+_md5_=a2acb534bb6cd96638e389da47e24b13
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2 b/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
index b4279ca7aa13..6bd786cc9c0c 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
+++ b/metadata/md5-cache/app-emulation/libvirt-5.2.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtua
 SLOT=0/5.2.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.2.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=af0e5fb96a7f70d641f707eeccfccfaf
+_md5_=7840526984f39c6e8a5709a2be2904e8
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 6c7b84deb3c4..bce24ac872a1 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -10,4 +10,4 @@ RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=7379ab8a88899bc0ee3aebf7a7c2719d
+_md5_=b6e2b21d88a2766243e54b4b49be08e0
diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
index a95535a764c2..a25520cd84df 100644
--- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-4.0.0-r3
@@ -4,7 +4,7 @@ DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_pyt
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=db220d2c81f5b815205ffdfe2f4b7b2f
+_md5_=472bf7e9a0c4be7d06c8e97522bbed90
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index ce4fa5591bf8..19498fea419f 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -4,10 +4,10 @@ DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_pyt
 DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
 EAPI=7
 HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
-IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 +filecaps
 LICENSE=GPL-2 LGPL-2 BSD-2
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	0d4635eeb5a96cd5315597a47eba25c9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ace22493d68b31269c902956207d6e98
+_md5_=64cc8cca843fd01fc9055f4bafd72ad3
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3
similarity index 97%
rename from metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2
rename to metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3
index 86c74c8cc928..dfc5f6b3cf11 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.12.0-r3
@@ -10,6 +10,6 @@ RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/
 REQUIRED_USE=python_targets_python2_7 ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.12
-SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-17.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-17.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.12.0/xen-4.12.0.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-18.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-18.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0869c4e3577073655cdb77b5022f8589
+_md5_=c4d71389838415e1ca29392d4ca9062f
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 69753569ad62..edf9fbdf45a9 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5 b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
index 4946c563428d..8b685e7ff44f 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
@@ -4,10 +4,10 @@ DESCRIPTION=PHP eselect module
 EAPI=6
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
 IUSE=fpm apache2
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=551610b785fa6812bfe35f33890c6eef
+_md5_=b896a4d481fe8de1997203c2f0f39785
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
index 4adbe959b8c1..8a06b567f3fb 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=7
 HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.4.13
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eselect-wxwidgets-20180529.tar.xz https://dev.gentoo.org/~mgorny/dist/eselect-wxwidgets-files.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f75d47c391a33e1689d63b2f0139b8f7
+_md5_=092dba6ce7ca217f818e72c0d0f8486b
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index c5741bb0ca8b..1805ca239aaf 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.9.2 b/metadata/md5-cache/app-metrics/prometheus-2.9.2
index 97c8e37ad153..33d53a7d47fa 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.9.2
+++ b/metadata/md5-cache/app-metrics/prometheus-2.9.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-1.12 >=dev-util/promu-0.3.0 >=dev-lang/go-1.10
 DESCRIPTION=Prometheus monitoring system and time series database
 EAPI=6
 HOMEPAGE=https://github.com/prometheus/prometheus
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.9.2.tar.gz -> prometheus-2.9.2.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=148b5050a8a1aafa9fab7fe86e032e0b
+_md5_=f8e2d6bc971f59e722f3547bb8ac21fd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index ce13a0ef4961..4611fae6dd4e 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/geoclue-2.4.13 b/metadata/md5-cache/app-misc/geoclue-2.4.13
index 37c016b20747..b91c0b601d6e 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.13
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.13
@@ -4,10 +4,10 @@ DESCRIPTION=A geoinformation D-Bus service
 EAPI=6
 HOMEPAGE=https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home
 IUSE=+introspection modemmanager zeroconf
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !<sci-geosciences/geocode-glib-3.10.0 x11-libs/libnotify
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.4.13/geoclue-2.4.13.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4bcd7017c97d2ea8ac2ab839c6f45534
+_md5_=7800084cc3b353e624ecc864dd73d638
diff --git a/metadata/md5-cache/app-misc/goobook-3.3 b/metadata/md5-cache/app-misc/goobook-3.3
new file mode 100644
index 000000000000..da6602f51698
--- /dev/null
+++ b/metadata/md5-cache/app-misc/goobook-3.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Access your Google contacts from the command line
+EAPI=7
+HOMEPAGE=https://gitlab.com/goobook/goobook
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/g/goobook/goobook-3.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7053a7ce33d9c9169c23e1be1709b813
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 83b4f4e275a3..a5a3317c8ca5 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/gnucash-3.3 b/metadata/md5-cache/app-office/gnucash-3.3
index 1a75f05c5365..0b3c7b29e21f 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3
+++ b/metadata/md5-cache/app-office/gnucash-3.3
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.3/gnucash-3.3.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f412925091b38c827f1b8d8b5efe3d67
+_md5_=191fec6aa53e30a75527f3101ef9d225
diff --git a/metadata/md5-cache/app-office/gnucash-3.3-r1 b/metadata/md5-cache/app-office/gnucash-3.3-r1
index 2c975b1b7824..9157cc29b081 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3-r1
+++ b/metadata/md5-cache/app-office/gnucash-3.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.3/gnucash-3.3.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=855149dce3d314e9a935aee78f5b0981
+_md5_=3f63915bf7a71edd7bcd3fb1e5fff363
diff --git a/metadata/md5-cache/app-office/gnucash-3.4 b/metadata/md5-cache/app-office/gnucash-3.4
index aacf3d81c8c0..3dc8b8741d5c 100644
--- a/metadata/md5-cache/app-office/gnucash-3.4
+++ b/metadata/md5-cache/app-office/gnucash-3.4
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.4/gnucash-3.4.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=dbb78cd992e0e84e868452346f29d41a
+_md5_=24dab66b35de21be361e6487ce0d8ce2
diff --git a/metadata/md5-cache/app-office/gnucash-3.5 b/metadata/md5-cache/app-office/gnucash-3.5
index 54ca9bfd76b3..69c31112f8b6 100644
--- a/metadata/md5-cache/app-office/gnucash-3.5
+++ b/metadata/md5-cache/app-office/gnucash-3.5
@@ -12,4 +12,4 @@ REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.5/gnucash-3.5.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7a30df4782bacf92af304a137d7b7cca
+_md5_=497f32feb7ff51502b4b480188416159
diff --git a/metadata/md5-cache/app-office/homebank-5.1.8 b/metadata/md5-cache/app-office/homebank-5.1.8
deleted file mode 100644
index 9ef5107be79e..000000000000
--- a/metadata/md5-cache/app-office/homebank-5.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 ) >=dev-lang/perl-5.8.1 dev-perl/XML-Parser >=dev-util/intltool-0.40.5 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Free, easy, personal accounting for everyone
-EAPI=6
-HOMEPAGE=http://homebank.free.fr/index.php
-IUSE=+ofx
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
-SLOT=0
-SRC_URI=http://homebank.free.fr/public/homebank-5.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2099c7290c69f5f13fb3a54f448bc2ec
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 6c717bda09e4..aa28fda003c9 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.1 b/metadata/md5-cache/app-portage/elicense-1.0.1
new file mode 100644
index 000000000000..2706bfe9d544
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elicense-1.0.1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(s)
+EAPI=7
+HOMEPAGE=https://github.com/Whissi/elicense
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.1.tar.gz -> elicense-1.0.1.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=436839d9454fd25e60b442a762afb5c7
diff --git a/metadata/md5-cache/app-portage/elicense-9999 b/metadata/md5-cache/app-portage/elicense-9999
new file mode 100644
index 000000000000..496a1e02c35d
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elicense-9999
@@ -0,0 +1,12 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(s)
+EAPI=7
+HOMEPAGE=https://github.com/Whissi/elicense
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=436839d9454fd25e60b442a762afb5c7
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4
deleted file mode 100644
index 8732519b7810..000000000000
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e090412ae83c22b77ecb3413b11940bd
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
new file mode 100644
index 000000000000..a22627076c07
--- /dev/null
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=d6c4b5f323c7826748e970e29ef319b3
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 3ccf5cdd8232..9f1d489f6bb2 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -1,12 +1,12 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Tool to help select distfiles mirrors for Gentoo
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Mirrorselect
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2
-RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-util/dialog net-analyzer/netselect =dev-python/ssl-fetch-9999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8470304d94f31315a14bd1b1e3a94fba
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f382ca82b38cd7fd845a928617ca83ca
diff --git a/metadata/md5-cache/app-portage/prefix-toolkit-1 b/metadata/md5-cache/app-portage/prefix-toolkit-1
new file mode 100644
index 000000000000..6ea9ffeed11b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/prefix-toolkit-1
@@ -0,0 +1,10 @@
+BDEPEND=>sys-apps/portage-2.3.62
+DEFINED_PHASES=configure install unpack
+DESCRIPTION=Utilities for users of Gentoo Prefix
+EAPI=7
+HOMEPAGE=https://prefix.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-3
+RDEPEND=!app-portage/prefix-chain-setup !sys-apps/prefix-chain-utils prefix-stack? ( >=sys-apps/baselayout-prefix-2.6 )
+SLOT=0
+_md5_=c065bb627b943e59acac97ebae711ab4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 01a0624cad83..fa1e91b0ba78 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/recode-3.6_p20-r1 b/metadata/md5-cache/app-text/recode-3.6_p20-r1
index 4aada0636870..1fcbe62a71f1 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20-r1
+++ b/metadata/md5-cache/app-text/recode-3.6_p20-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Convert files between various character sets
 EAPI=5
 HOMEPAGE=https://github.com/rrthomas/recode
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8864d85540404fb62d76e58a7deff17e
+_md5_=6f973ea2d52cd80f7c8e22203002e33a
diff --git a/metadata/md5-cache/app-text/wdiff-1.2.2-r1 b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
index e2d24faf6c37..ba050f796393 100644
--- a/metadata/md5-cache/app-text/wdiff-1.2.2-r1
+++ b/metadata/md5-cache/app-text/wdiff-1.2.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Create a diff disregarding formatting
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/wdiff/
 IUSE=experimental test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=d24c4b861ee1c5521c87d0784ef0d3c9
+_md5_=e52ad0c275c68a6668bce0d7abd0ce21
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 28ff426801bc..44928a5df08b 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/vim-go-1.20 b/metadata/md5-cache/app-vim/vim-go-1.20
new file mode 100644
index 000000000000..3aaee8b5a054
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-go-1.20
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: Go development plugin for Vim
+EAPI=6
+HOMEPAGE=https://github.com/fatih/vim-go
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/fatih/vim-go/archive/v1.20.tar.gz -> vim-go-1.20.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=0bb3b8033ef99c9496e512e1ca9bf352
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index a60a64e7bfac..912f2e8a36e3 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/cdb-0.75-r4 b/metadata/md5-cache/dev-db/cdb-0.75-r4
index b5909612579b..414887e23713 100644
--- a/metadata/md5-cache/dev-db/cdb-0.75-r4
+++ b/metadata/md5-cache/dev-db/cdb-0.75-r4
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 DESCRIPTION=Fast, reliable, simple package for creating and reading constant databases
 EAPI=5
 HOMEPAGE=http://cr.yp.to/cdb.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 RDEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
 SLOT=0
 SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b42fce75c8d9aa8cad9959f4aa0b5fdb
+_md5_=59700df22ebf615e8fce9520b6b1fc57
diff --git a/metadata/md5-cache/dev-db/freetds-1.00.558 b/metadata/md5-cache/dev-db/freetds-1.00.558
index 453bd3fea8e5..9d89e6061aa8 100644
--- a/metadata/md5-cache/dev-db/freetds-1.00.558
+++ b/metadata/md5-cache/dev-db/freetds-1.00.558
@@ -4,11 +4,11 @@ DESCRIPTION=Tabular Datastream Library
 EAPI=7
 HOMEPAGE=http://www.freetds.org/
 IUSE=debug gnutls iconv kerberos libressl mssql iodbc odbc ssl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-apps/sed sys-apps/grep virtual/awk gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sys-devel/binutils net-dns/bind-tools
 REQUIRED_USE=?? ( iodbc odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.freetds.org/pub/freetds/current/freetds-dev.1.00.558.tar.gz
-_md5_=9089562764eaec2c323b433aca5ea371
+_md5_=1acd161d5dfa225298a40c1632bb8911
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.18 b/metadata/md5-cache/dev-db/lmdb-0.9.18
deleted file mode 100644
index 868580e2bb54..000000000000
--- a/metadata/md5-cache/dev-db/lmdb-0.9.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
-EAPI=5
-HOMEPAGE=http://symas.com/mdb/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=OPENLDAP
-RDEPEND=!=net-nds/openldap-2.4.40
-SLOT=0/0.9.18
-SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.18.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0831a62a7a185773970d5bb0293a2062
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.19 b/metadata/md5-cache/dev-db/lmdb-0.9.19
deleted file mode 100644
index 6f2444bc1418..000000000000
--- a/metadata/md5-cache/dev-db/lmdb-0.9.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
-EAPI=6
-HOMEPAGE=http://symas.com/mdb/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=OPENLDAP
-RDEPEND=!=net-nds/openldap-2.4.40
-SLOT=0/0.9.19
-SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9513931bc09f34aee509549bb7923e8
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.21-r1 b/metadata/md5-cache/dev-db/lmdb-0.9.21-r1
deleted file mode 100644
index 9f9c802705b6..000000000000
--- a/metadata/md5-cache/dev-db/lmdb-0.9.21-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
-EAPI=6
-HOMEPAGE=http://symas.com/mdb/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=OPENLDAP
-RDEPEND=!=net-nds/openldap-2.4.40
-SLOT=0/0.9.21
-SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ceb7089a67ce655afe05cd13399878c4
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.22 b/metadata/md5-cache/dev-db/lmdb-0.9.22
deleted file mode 100644
index 08a9ad1792e3..000000000000
--- a/metadata/md5-cache/dev-db/lmdb-0.9.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
-EAPI=7
-HOMEPAGE=http://symas.com/mdb/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=OPENLDAP
-RDEPEND=!=net-nds/openldap-2.4.40-r0
-SLOT=0/0.9.22
-SRC_URI=https://github.com/LMDB/lmdb/archive/LMDB_0.9.22.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a3076d71d305af9693e7edcb7a6e1fca
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 3513d14c74f3..9e22dfb7da2d 100644
Binary files a/metadata/md5-cache/dev-erlang/Manifest.gz and b/metadata/md5-cache/dev-erlang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.13 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
index 5b0e9c73209f..c896bcbf3d4f 100644
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
+++ b/metadata/md5-cache/dev-erlang/p1_utils-1.0.13
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Erlang utility modules from ProcessOne
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_utils
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_utils/archive/1.0.13.tar.gz -> p1_utils-1.0.13.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=99c2acdf9c16224ae8853c0c2dccf45a
+_md5_=0d571eb4eb5a85eeed8aec02dbad43ab
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1777272c53e9..3e46747caf88 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/maven-bin-3.0.5 b/metadata/md5-cache/dev-java/maven-bin-3.0.5-r1
similarity index 82%
rename from metadata/md5-cache/dev-java/maven-bin-3.0.5
rename to metadata/md5-cache/dev-java/maven-bin-3.0.5-r1
index 4d0e2e59e593..fbab92269064 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=6
 HOMEPAGE=https://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=app-eselect/eselect-java >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.0
 SRC_URI=mirror://apache/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20624059dd917ef58327455f83cd1ba5
+_md5_=001e4b13d1e564d10e8f5b0ed801b4a0
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1-r1
similarity index 51%
rename from metadata/md5-cache/dev-java/maven-bin-3.1.1
rename to metadata/md5-cache/dev-java/maven-bin-3.1.1-r1
index ecb0b6ce53d2..0fee53560915 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
+EAPI=6
 HOMEPAGE=https://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=277d86b417e86c8ff3a9898cc9ec8de1
+_md5_=6c91c1147fa991c6eb7751a701f38dbb
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5 b/metadata/md5-cache/dev-java/maven-bin-3.2.5-r1
similarity index 51%
rename from metadata/md5-cache/dev-java/maven-bin-3.2.5
rename to metadata/md5-cache/dev-java/maven-bin-3.2.5-r1
index b9bdeacc2c60..298c5dc3de30 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.5-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
+EAPI=6
 HOMEPAGE=https://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.2
 SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=86b7510892969fba322e3632bc803cdc
+_md5_=e9549aa5ed3e99b54395a4b1f0750da4
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.9 b/metadata/md5-cache/dev-java/maven-bin-3.3.9-r1
similarity index 53%
rename from metadata/md5-cache/dev-java/maven-bin-3.3.9
rename to metadata/md5-cache/dev-java/maven-bin-3.3.9-r1
index 6e9431bdd0ea..0693005df6ac 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.9
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.9-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=5
+EAPI=6
 HOMEPAGE=https://maven.apache.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.3
 SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=dc7cc990a624af20b6b69ad35be0df93
+_md5_=b342c71c21fcf077be37d0170c184e1b
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.0 b/metadata/md5-cache/dev-java/maven-bin-3.6.0
deleted file mode 100644
index a48d3101cfc1..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=6
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=3.6
-SRC_URI=mirror://apache/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c108eb32058d411ffeecb51ccaee91f2
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.1 b/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
similarity index 52%
rename from metadata/md5-cache/dev-java/maven-bin-3.6.1
rename to metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
index dc35aae745e6..2ff05c943f31 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 ) >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Project Management and Comprehension Tool for Java
 EAPI=6
 HOMEPAGE=https://maven.apache.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.6
 SRC_URI=mirror://apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6da732ef906f78ba3a8d35a6e6f3c7d2
+_md5_=805e8df361f0d498ddeac0a0f8e7d622
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f5ea645e3006..c82c169cf27a 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/perl-5.28.2-r1 b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
index d84e095b7dc3..5f964ced5db1 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.2-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.28.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.2-patches-4/perl-5.28.2-patches-4.tar.xz mirror://gentoo/perl-5.28.2-patches-4.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.28.2-patches-4.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae44a2bd206e37e89fb85ac8b46ca981
+_md5_=1a001411f5a405142fd418023fdd018d
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index 6aee6fab2085..60c5b01c8738 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.28.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.0-patches-1/perl-5.28.0-patches-1.tar.xz mirror://gentoo/perl-5.28.0-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.28.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=457e3d221bf14dc5610671fc4a014c6e
+_md5_=8af9b285e5a1ab316b8486b82a9ae9eb
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.0_rc2 b/metadata/md5-cache/dev-lang/perl-5.30.0
similarity index 75%
rename from metadata/md5-cache/dev-lang/perl-5.30.0_rc2
rename to metadata/md5-cache/dev-lang/perl-5.30.0
index d488cdcbf226..dd60b6c980b3 100644
--- a/metadata/md5-cache/dev-lang/perl-5.30.0_rc2
+++ b/metadata/md5-cache/dev-lang/perl-5.30.0
@@ -9,6 +9,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.30
-SRC_URI=mirror://cpan/src/5.0/perl-5.30.0-RC2.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0-RC2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.30.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d970de699b6fd6bec7349f40edb6a4db
+_md5_=b0f48750a28afd909d51a46d569daef1
diff --git a/metadata/md5-cache/dev-lang/php-7.1.27 b/metadata/md5-cache/dev-lang/php-7.1.27
index 28161ab15dc7..0534ca7b1714 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.27
+++ b/metadata/md5-cache/dev-lang/php-7.1.27
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +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 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 spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) 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 ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg: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[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? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) 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 ) 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 ) ) 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= ) 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 )
 SLOT=7.1
 SRC_URI=https://php.net/distributions/php-7.1.27.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6283e1dd98283c5dc3adab1903a40cf9
+_md5_=afecea77b8f419523d7189d4f005b723
diff --git a/metadata/md5-cache/dev-lang/php-7.2.16 b/metadata/md5-cache/dev-lang/php-7.2.16
index f37e756c2755..99d09dd54863 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.16
+++ b/metadata/md5-cache/dev-lang/php-7.2.16
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[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 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[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? ( || ( sys-freebsd/freebsd-lib 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 )
 SLOT=7.2
 SRC_URI=https://php.net/distributions/php-7.2.16.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=641491379b20d149b12c0e8f36c0ef7c
+_md5_=ef6d54c518b2452076c21c766c290fff
diff --git a/metadata/md5-cache/dev-lang/php-7.3.5 b/metadata/md5-cache/dev-lang/php-7.3.5
index faed5826c7ff..0d7b5c0ea369 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.5
+++ b/metadata/md5-cache/dev-lang/php-7.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[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 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[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? ( || ( sys-freebsd/freebsd-lib 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 )
 SLOT=7.3
 SRC_URI=https://php.net/distributions/php-7.3.5.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=873712911866d0cef32a2012b566147a
+_md5_=dc51eec798ddc4fddf511f6b7e7b2411
diff --git a/metadata/md5-cache/dev-lang/sassc-3.6.0 b/metadata/md5-cache/dev-lang/sassc-3.6.0
new file mode 100644
index 000000000000..aa23800c532c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/sassc-3.6.0
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=prepare
+DEPEND=dev-libs/libsass:=
+DESCRIPTION=A libsass command line driver
+EAPI=7
+HOMEPAGE=https://github.com/sass/sassc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libsass:=
+SLOT=0
+SRC_URI=https://github.com/sass/sassc/archive/3.6.0.tar.gz -> sassc-3.6.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ec6a72d44aad6000dda648b4ae38c73c
diff --git a/metadata/md5-cache/dev-lang/sassc-9999 b/metadata/md5-cache/dev-lang/sassc-9999
deleted file mode 100644
index 4c6702f18233..000000000000
--- a/metadata/md5-cache/dev-lang/sassc-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=>=dev-libs/libsass-3.5:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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]
-DESCRIPTION=A libsass command line driver
-EAPI=6
-HOMEPAGE=https://github.com/sass/sassc
-LICENSE=MIT
-RDEPEND=>=dev-libs/libsass-3.5:=
-SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=02bc332bc95244aff5c0636b5001f316
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9cd913a3985e..efc959be39e3 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/apr-util-1.6.1-r3 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
index 3debc0dfa281..417689db0d25 100644
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
+++ b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Apache Portable Runtime Utility Library
 EAPI=7
 HOMEPAGE=https://apr.apache.org/
 IUSE=berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=944be499e1186a566ba5a640d7165901
+_md5_=a14502958668b20f1a3cad82b1229c0d
diff --git a/metadata/md5-cache/dev-libs/efl-1.20.7-r3 b/metadata/md5-cache/dev-libs/efl-1.20.7-r3
deleted file mode 100644
index 093599fe08ae..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.20.7-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles2? ( media-libs/mesa[egl,gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux sys-libs/zlib:= virtual/jpeg:0= avahi? ( net-dns/avahi ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) glib? ( dev-libs/glib:2 ) gles2? ( media-libs/mesa[egl,gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) nls? ( sys-devel/gettext ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( >=media-video/vlc-3.0.0 ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl xpresent? ( x11-libs/libXpresent ) ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) !media-libs/elementary !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders
-REQUIRED_USE=?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.20.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5e0986d37290af4f41276d91df715e2a
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.3.0 b/metadata/md5-cache/dev-libs/fstrm-0.3.0
index 20a5382b9a75..6da59bbb1ca3 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.3.0
+++ b/metadata/md5-cache/dev-libs/fstrm-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Frame Streams implementation in C
 EAPI=6
 HOMEPAGE=https://github.com/farsightsec/fstrm
 IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.3.0.tar.gz -> fstrm-0.3.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ecaa1f52fd3a9df10dfaadb71ad90f89
+_md5_=097dd40a01e87c2e47cbfaed658bd30d
diff --git a/metadata/md5-cache/dev-libs/gjs-1.54.3 b/metadata/md5-cache/dev-libs/gjs-1.54.3
index ead24665ef3b..b29a0b8b92bb 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.54.3
+++ b/metadata/md5-cache/dev-libs/gjs-1.54.3
@@ -4,11 +4,11 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 IUSE=+cairo examples gtk readline test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.54.0 >=dev-libs/gobject-introspection-1.53.4:= readline? ( sys-libs/readline:0= ) dev-lang/spidermonkey:60 virtual/libffi:= cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.54/gjs-1.54.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8dc73c0bcdb77cd3aae03354d1afc3c3
+_md5_=7c492e06fec8e81f62ab217f111410a3
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8 b/metadata/md5-cache/dev-libs/hyphen-2.8.8
index 73728183dc69..0721f1cd5722 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.8
@@ -4,9 +4,9 @@ DESCRIPTION=ALTLinux hyphenation library
 EAPI=6
 HOMEPAGE=http://hunspell.github.io/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=52651da7e217d81a682943f97dc76f6f
+_md5_=6a92712e8108bdf1b1be6ce3568a0edb
diff --git a/metadata/md5-cache/dev-libs/icu-64.2 b/metadata/md5-cache/dev-libs/icu-64.2
index 2e65f352c46b..bd6c71fb9c4b 100644
--- a/metadata/md5-cache/dev-libs/icu-64.2
+++ b/metadata/md5-cache/dev-libs/icu-64.2
@@ -5,9 +5,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/64.2
 SRC_URI=http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bb5867daee36e71d422b350999a070a8
+_md5_=29497916448103612b2f0570651c0e25
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-64.2 b/metadata/md5-cache/dev-libs/icu-layoutex-64.2
index 01a5438cafa8..f9cbad69da09 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-64.2
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-64.2
@@ -5,10 +5,10 @@ DESCRIPTION=External layout part of International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=~dev-libs/icu-64.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/icu-le-hb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/64.2
 SRC_URI=http://download.icu-project.org/files/icu4c/64.2/icu4c-64_2-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a1b0d64a6967c6a3616a2459d49d09e7
+_md5_=57c1d6f5b00cf08adb84146d8d6c575f
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.4 b/metadata/md5-cache/dev-libs/ivykis-0.42.4
new file mode 100644
index 000000000000..b254e9d4d762
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.4
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DESCRIPTION=Library for asynchronous I/O readiness notification
+EAPI=7
+HOMEPAGE=https://github.com/buytenh/ivykis
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.4.tar.gz -> ivykis-0.42.4.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=21156aa55214b0866102e166a9a8d78b
diff --git a/metadata/md5-cache/dev-libs/libbpf-0.20190404 b/metadata/md5-cache/dev-libs/libbpf-0.20190404
index 48cfda473d9e..c63011e9a90b 100644
--- a/metadata/md5-cache/dev-libs/libbpf-0.20190404
+++ b/metadata/md5-cache/dev-libs/libbpf-0.20190404
@@ -4,10 +4,10 @@ DESCRIPTION=Stand-alone build of libbpf from the Linux kernel
 EAPI=7
 HOMEPAGE=https://github.com/libbpf/libbpf
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2.1 BSD-2
 RDEPEND=virtual/libelf !<=dev-util/bcc-0.7.0
 SLOT=0/0.20190404
 SRC_URI=https://github.com/libbpf/libbpf/archive/7c27c6306160f630c3c4f4b4971deb657126d681.tar.gz -> libbpf-0.20190404.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=95be3679b03035480ca89cb3c11c423b
+_md5_=dcf0d5999815a562b017e285cb431445
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.2 b/metadata/md5-cache/dev-libs/libgit2-0.28.2
new file mode 100644
index 000000000000..b92b89f407ef
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-0.28.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
+DESCRIPTION=A linkable library for Git
+EAPI=7
+HOMEPAGE=https://libgit2.github.com/
+IUSE=examples gssapi libressl +ssh test +threads trace
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
+RESTRICT=!test? ( test )
+SLOT=0/28
+SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.2.tar.gz -> libgit2-0.28.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=81482d9897f76f8972074f3dcda5ba71
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.4 b/metadata/md5-cache/dev-libs/libical-3.0.4
index 3a083aaaac78..42f4f08364ad 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.4
+++ b/metadata/md5-cache/dev-libs/libical-3.0.4
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.4/libical-3.0.4.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6de71bc7fdeb03dc04c52a6b32eb10bc
+_md5_=9dfb84f471928531ac1a8556ce229302
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.5 b/metadata/md5-cache/dev-libs/libical-3.0.5
new file mode 100644
index 000000000000..6496b8e4fcb5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libical-3.0.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= )
+DESCRIPTION=An implementation of basic iCAL protocols
+EAPI=7
+HOMEPAGE=https://github.com/libical/libical
+IUSE=berkdb doc examples static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=|| ( MPL-2.0 LGPL-2.1 )
+RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
+SLOT=0/3
+SRC_URI=https://github.com/libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b671bc47385eab067e3b009ce5f4b8d0
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
index a9880db222ea..71fd9ade9088 100644
--- a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=libmcrypt provides uniform interface to access several encryption algorithms
 EAPI=7
 HOMEPAGE=http://mcrypt.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8be59db53e7f0f5a524d1984c77d8e6d
+_md5_=36bc69da64759996310b24ef17bc3786
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
index 08f3516392d0..4e7b78d23a70 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=A Qt implementation of XDG standards
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/3.3.1/libqtxdg-3.3.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=33d509d6c39699a2d9398337e36938df
+_md5_=b95e801601c05e03a3ff965faa63947d
diff --git a/metadata/md5-cache/dev-libs/libressl-2.9.2 b/metadata/md5-cache/dev-libs/libressl-2.9.2
new file mode 100644
index 000000000000..5caf37991784
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-2.9.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0 >=app-portage/elt-patches-20170815
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=6
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+SLOT=0/47
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=76dd005d9979acacdeb86aee5881dce3
diff --git a/metadata/md5-cache/dev-libs/libslz-1.1.0 b/metadata/md5-cache/dev-libs/libslz-1.1.0
index 76e4a6044163..2939508b0726 100644
--- a/metadata/md5-cache/dev-libs/libslz-1.1.0
+++ b/metadata/md5-cache/dev-libs/libslz-1.1.0
@@ -3,9 +3,9 @@ DESCRIPTION=stateless, zlib-compatible, and very fast compression library
 EAPI=6
 HOMEPAGE=http://1wt.eu/projects/libslz
 IUSE=static-libs tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ppc x86
+KEYWORDS=amd64 arm ~arm64 ppc x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=http://git.1wt.eu/web?p=libslz.git;a=snapshot;h=v1.1.0;sf=tbz2 -> libslz-1.1.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=486d328ad00882f85eb190be0b892240
+_md5_=53cccde18525cc2ee3e75f5a61ff6078
diff --git a/metadata/md5-cache/dev-libs/libuv-1.28.0 b/metadata/md5-cache/dev-libs/libuv-1.28.0
index 257811188a8a..6d332080e090 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.28.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.28.0
@@ -5,10 +5,10 @@ DESCRIPTION=Cross-platform asychronous I/O
 EAPI=7
 HOMEPAGE=https://github.com/libuv/libuv
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD BSD-2 ISC MIT
 RESTRICT=test
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.28.0.tar.gz -> libuv-1.28.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1a50db7268533bd2a3ad78622624501a
+_md5_=77da66f034d84f3a8957d9ee9f86eeb8
diff --git a/metadata/md5-cache/dev-libs/libuv-1.29.1 b/metadata/md5-cache/dev-libs/libuv-1.29.1
new file mode 100644
index 000000000000..f6e2ebbe4ff3
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.29.1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=7
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.29.1.tar.gz -> libuv-1.29.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1a50db7268533bd2a3ad78622624501a
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
index 69c29609a762..159309412e23 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs elibc_Darwin python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.33.tar.gz https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch -> libxslt-1.1.33-CVE-2019-11068.patch
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=71fb7d45aa8af92c40bd46d24ea4731e
+_md5_=e3a3ced5e81c4e6df3154ccd89576327
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.1 b/metadata/md5-cache/dev-libs/libzip-1.5.1
index 1931d9e42f0f..5d242ed24a44 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.5.1
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.1
@@ -5,10 +5,10 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=7
 HOMEPAGE=https://nih.at/libzip/
 IUSE=bzip2 doc gnutls libressl ssl static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.5.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ca4bd112c2bad3ad8ab8a583be745962
+_md5_=87cddb0e650236d1f7c74ea2eb35f3c9
diff --git a/metadata/md5-cache/dev-libs/mm-1.4.2-r2 b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
index 5fc32fa78d0f..dc2aec89ff58 100644
--- a/metadata/md5-cache/dev-libs/mm-1.4.2-r2
+++ b/metadata/md5-cache/dev-libs/mm-1.4.2-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install prepare test
 DESCRIPTION=Shared Memory Abstraction Library
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/mm/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=mm
 SLOT=1.2
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/mm/mm-1.4.2.tar.gz
-_md5_=e4d9dfaf504765f8431a1fb6ef4c1657
+_md5_=649840d435f1e02e1aef9f8f2ce635d2
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index efd9317d0200..50847ef35817 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -7,4 +7,4 @@ IUSE=doc examples test
 LICENSE=MIT
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4fa75bf977799794f3f070ee695ff822
+_md5_=ad9c3912f01cc0c0f057b95250ed6d68
diff --git a/metadata/md5-cache/dev-libs/rasqal-0.9.33 b/metadata/md5-cache/dev-libs/rasqal-0.9.33
index 1c0748e2665e..01a075426f16 100644
--- a/metadata/md5-cache/dev-libs/rasqal-0.9.33
+++ b/metadata/md5-cache/dev-libs/rasqal-0.9.33
@@ -5,10 +5,10 @@ DESCRIPTION=Library that handles Resource Description Framework (RDF)
 EAPI=7
 HOMEPAGE=http://librdf.org/rasqal/
 IUSE=+crypt gmp kernel_linux +mhash pcre static-libs test xml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/raptor-2.0.15 crypt? ( !mhash? ( dev-libs/libgcrypt:0 ) mhash? ( app-crypt/mhash ) ) !gmp? ( dev-libs/mpfr:= ) gmp? ( dev-libs/gmp:= ) kernel_linux? ( >=sys-apps/util-linux-2.19 ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/rasqal-0.9.33.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0283606765a14a962582bc65d08a70d5
+_md5_=1b3af28a40c0fe990df9e17a8baded15
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r2 b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
index c38e63d6123f..8a82aea9eb6b 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17-r2
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r2
@@ -5,10 +5,10 @@ DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=7
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libltdl:0 mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( dev-db/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e4b10ea84a673d14c5cca70e9cd7fa72
+_md5_=a731a771c3f14515fd18698c32742b05
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
index 2837439d1cd5..5111ec28aff9 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Language bindings for Redland
 EAPI=5
 HOMEPAGE=http://librdf.org/bindings/
 IUSE=lua perl python php ruby python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1:0 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:* ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ruby? ( dev-lang/ruby:* dev-ruby/log4r )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.14.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93e24929740cd7332ea4557f0b58e0e5
+_md5_=1094bd0bb5bdfe077b4ebaa2108e7c2d
diff --git a/metadata/md5-cache/dev-libs/serd-0.28.0-r1 b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
index 98be1f14f25f..8385f71bf649 100644
--- a/metadata/md5-cache/dev-libs/serd-0.28.0-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=65dc6058ac8fb1e33940ccb5250f1d8d
+_md5_=ad9ffdddc32f1b0905dec09759548845
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.0-r1 b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
index 0884864e575a..f35f5fbdb1e9 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for storing RDF data in memory
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sord/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-libs/serd-0.28.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=adc0e5d74b26df03a1b2e15e1ef0bba3
+_md5_=0ae7a055f460343e47b5de0d9d0ebc2c
diff --git a/metadata/md5-cache/dev-libs/yajl-2.1.0-r2 b/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
index d4121ade438e..dde5e2a2203e 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
+++ b/metadata/md5-cache/dev-libs/yajl-2.1.0-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Small event-driven (SAX-style) JSON parser
 EAPI=6
 HOMEPAGE=https://lloyd.github.com/yajl/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC
 SLOT=0/2
 SRC_URI=https://github.com/lloyd/yajl/tarball/2.1.0 -> yajl-2.1.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8c0badc59ec1a719e7f29367e94e282a
+_md5_=6a82c3a9521983b4aee82a49a66dd981
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0 b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
index e6f3fa96ebf8..4dcbd97c1f67 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
 DESCRIPTION=Simplistic perl interface to pkg-config
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/ExtUtils-PkgConfig
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=581c948d02065fae95499a1160351d4d
+_md5_=2e66c164c743c010e465327f61dfd00d
diff --git a/metadata/md5-cache/dev-perl/GD-2.560.0-r1 b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
index def3442fca88..368527d9a544 100644
--- a/metadata/md5-cache/dev-perl/GD-2.560.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/GD
 IUSE=animgif gif jpeg png truetype xpm
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-Complex >=media-libs/gd-2.0.33 png? ( media-libs/gd[png] media-libs/libpng:0 sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg:0 ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) gif? ( media-libs/giflib ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GD-2.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=d126a8be98d3f45f4bdbccaae6683be4
+_md5_=6ddd1ed9ab675d4d874e0dce5fc33c19
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9f2df6e5d9fa..5f29f707fc6c 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1 b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
index 02bdf7750bbd..f1c3e49bdde1 100644
--- a/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-DOM-1.460.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A Perl module for an DOM Level 1 compliant interface
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-DOM
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/libwww-perl >=dev-perl/XML-Parser-2.300.0 dev-perl/XML-RegExp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=ff72aed692efe4fccc334c6173935cd5
+_md5_=3c8d0edb136f9891812e832cc78d5b83
diff --git a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1 b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
index ec50a94b1880..bbff2b5647c8 100644
--- a/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-RegExp-0.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 DESCRIPTION=Regular expressions for XML tokens
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/XML-RegExp
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/XML-Parser-2.29 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5522e6e5a39792e4500c2157aa1b841b
+_md5_=fe5e1f6f5a284d422ccd453ac92577d9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 3480b01a8ff6..ecf94744b06f 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/autobahn-18.3.1 b/metadata/md5-cache/dev-python/autobahn-18.3.1
index d4e7f7fbb858..10e977a80d9e 100644
--- a/metadata/md5-cache/dev-python/autobahn-18.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-18.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket and WAMP for Twisted and Asyncio
 EAPI=5
 HOMEPAGE=https://pypi.org/project/autobahn/ https://crossbar.io/autobahn/ https://github.com/crossbario/autobahn-python
 IUSE=crypt test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lz4-0.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.8.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snappy-0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.6.0-r2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wsaccel-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] crypt? ( >=dev-python/pyopenssl-16.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-16.0.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-18.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2e839e0318272907075fd18c8f0b97a3
+_md5_=4c7d2d892ae58d6f15ea0f787e14fb83
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.4 b/metadata/md5-cache/dev-python/bsddb3-6.2.4
index 079974d058bc..52fe70464b34 100644
--- a/metadata/md5-cache/dev-python/bsddb3-6.2.4
+++ b/metadata/md5-cache/dev-python/bsddb3-6.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Berkeley DB
 EAPI=6
 HOMEPAGE=https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=<sys-libs/db-6.3:= || ( sys-libs/db:6.2 sys-libs/db:6.1 sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.4.tar.gz
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7263b2f5ef4d38b3842ccfd2b45b662c
+_md5_=5d471459d73b7470ec7fc4ec4fa1357c
diff --git a/metadata/md5-cache/dev-python/click-plugins-1.0.3 b/metadata/md5-cache/dev-python/click-plugins-1.0.3
index 1616078b7121..272772a0bdcb 100644
--- a/metadata/md5-cache/dev-python/click-plugins-1.0.3
+++ b/metadata/md5-cache/dev-python/click-plugins-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Module for click to enable registering CLI commands via setuptools e
 EAPI=6
 HOMEPAGE=https://pypi.org/project/click-plugins/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=076fe0e2e8a540e276dc5b5da344f677
+_md5_=e4f21535614399c5bf1f307584314a11
diff --git a/metadata/md5-cache/dev-python/fido2-0.6.0 b/metadata/md5-cache/dev-python/fido2-0.6.0
new file mode 100644
index 000000000000..12a2fe15097c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fido2-0.6.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) examples? ( dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyfakefs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Python based FIDO 2.0 library
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/python-fido2
+IUSE=examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) examples? ( dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.6.0/fido2-0.6.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=0300f09c96bb4e433bc481f0976401a0
diff --git a/metadata/md5-cache/dev-python/httpbin-0.4.1 b/metadata/md5-cache/dev-python/httpbin-0.4.1
index 7488fd9e9edf..20960f0bd01f 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.4.1
+++ b/metadata/md5-cache/dev-python/httpbin-0.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP Request and Response Service
 EAPI=5
 HOMEPAGE=https://github.com/Runscope/httpbin https://pypi.org/project/httpbin/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/decorator[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/itsdangerous[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7b3d58b209dc00662a2a61d5ea1e4e62
+_md5_=d7e6e6a86dab12b103695cb789275cde
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.4 b/metadata/md5-cache/dev-python/isodate-0.5.4
index 7ef93b6d3a53..347ed5eb804a 100644
--- a/metadata/md5-cache/dev-python/isodate-0.5.4
+++ b/metadata/md5-cache/dev-python/isodate-0.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=ISO 8601 date/time/duration parser and formatter
 EAPI=6
 HOMEPAGE=https://pypi.org/project/isodate/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.5.4.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b8a6eb317f8f2dd614f5461d277ffa83
+_md5_=fb754d5c0d536e14abacffd5f5fdbb8f
diff --git a/metadata/md5-cache/dev-python/jinja-2.10.1 b/metadata/md5-cache/dev-python/jinja-2.10.1
index 2d666e7e0cc1..132bbe440f8d 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10.1
+++ b/metadata/md5-cache/dev-python/jinja-2.10.1
@@ -5,7 +5,7 @@ DESCRIPTION=A full-featured template engine for Python
 EAPI=7
 HOMEPAGE=http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.1.tar.gz -> jinja-2.10.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=78c907ce4204e91d0511bdace651bc25
+_md5_=8cd49e1f4b1dca2517572b812e7da980
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.29.0_rc1 b/metadata/md5-cache/dev-python/llvmlite-0.29.0_rc1
new file mode 100644
index 000000000000..1e83a2893fde
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmlite-0.29.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:8 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python wrapper around the llvm C++ library
+EAPI=6
+HOMEPAGE=http://llvmlite.pydata.org/
+IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:8 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/numba/llvmlite/archive/v0.29.0rc1.tar.gz -> llvmlite-0.29.0rc1.gh.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	llvm	f36be95c5bfae7bc8c82a966d3c8324f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=498be833c969a196f4993c01d6aa099b
diff --git a/metadata/md5-cache/dev-python/lmdb-0.92 b/metadata/md5-cache/dev-python/lmdb-0.92
index 5652be2251f3..a6e7dffdc2b7 100644
--- a/metadata/md5-cache/dev-python/lmdb-0.92
+++ b/metadata/md5-cache/dev-python/lmdb-0.92
@@ -5,11 +5,11 @@ DESCRIPTION=Python bindings for the Lightning Database
 EAPI=7
 HOMEPAGE=https://github.com/dw/py-lmdb/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=OPENLDAP
 RDEPEND=dev-db/lmdb:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-0.92.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=a5787f15edc169768401e64ff41bcbc3
+_md5_=cc26bc6743d69c3738e4d4e093fdd30d
diff --git a/metadata/md5-cache/dev-python/lz4-0.10.1 b/metadata/md5-cache/dev-python/lz4-0.10.1
index b58b13dfb6a2..6d819ae8d7a9 100644
--- a/metadata/md5-cache/dev-python/lz4-0.10.1
+++ b/metadata/md5-cache/dev-python/lz4-0.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=LZ4 Bindings for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.10.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a4d83795b8e39b68cf446ae6af8257b2
+_md5_=3bcc2bba808ac9f4f2b37613dddf3007
diff --git a/metadata/md5-cache/dev-python/lz4-2.1.6 b/metadata/md5-cache/dev-python/lz4-2.1.6
index b15494939466..529fdcbcd405 100644
--- a/metadata/md5-cache/dev-python/lz4-2.1.6
+++ b/metadata/md5-cache/dev-python/lz4-2.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=LZ4 Bindings for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-arch/lz4 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-2.1.6.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1381e3f24aaafba4c746afcece934b7d
+_md5_=854c16bf866a23ee8367bad40c7b7569
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
index fd04c1533304..543cf057f9c5 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A client class with support for both MQTT v3.1 and v3.1.1
 EAPI=6
 HOMEPAGE=https://www.eclipse.org/paho/clients/python/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=EPL-1.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.4.0.tar.gz -> paho-mqtt-1.4.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2b1e5fe487186c34e02cad22de2628ab
+_md5_=ce8062e40792f21f8f7917e71ba12c86
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
index 8e0c3a014fac..df0d386430df 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pathtools/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2c1aa137afc4657cf0e5a0229a3fc930
+_md5_=ea73182699524e1fb5a58776281adc07
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.4.0 b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
index 27cb52770718..4fc6884f6425 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.4.0
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Interface Python with pkg-config
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=virtual/pkgconfig python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgconfig/pkgconfig-1.4.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=31f12c5f841b5f92ec257a9ef22de302
+_md5_=370e94d2e877c05ebe9e767b0576c4ea
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.39.3 b/metadata/md5-cache/dev-python/progressbar2-3.39.3
new file mode 100644
index 000000000000..29558e2c6865
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -0,0 +1,14 @@
+BDEPEND=!dev-python/progressbar[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-utils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Text progressbar library for python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/progressbar2/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=!dev-python/progressbar[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-utils[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.39.3.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=ead9aae50f771b3010c51617e63df698
diff --git a/metadata/md5-cache/dev-python/py-ubjson-0.11.0 b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
index 209cc88b83eb..00b49e1e1645 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.11.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.11.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=98480519b465b61dbf3214e96d362bd2
+_md5_=da4ef00da6619d61e49cae25cb9d411b
diff --git a/metadata/md5-cache/dev-python/pygments-2.3.1 b/metadata/md5-cache/dev-python/pygments-2.3.1
index 0109f3000698..acfd754cbd5a 100644
--- a/metadata/md5-cache/dev-python/pygments-2.3.1
+++ b/metadata/md5-cache/dev-python/pygments-2.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=Pygments is a syntax highlighting package written in Python
 EAPI=7
 HOMEPAGE=http://pygments.org/ https://pypi.org/project/Pygments/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.3.1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bd17d5b1f1ac392e0fd2e93c4c95d9fe
+_md5_=20ff096243553beaa307ab002efd222f
diff --git a/metadata/md5-cache/dev-python/pynacl-1.3.0 b/metadata/md5-cache/dev-python/pynacl-1.3.0
index be93601f189b..2300243f7243 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.3.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=7
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.3.0.tar.gz -> pynacl-1.3.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=4b2229135493f569b7b9edd106c97e61
+_md5_=ddfbabfb08197fef7ff5a258d28dde52
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.18 b/metadata/md5-cache/dev-python/pypng-0.0.18
index 21e217d5f489..592f74569c69 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.18
+++ b/metadata/md5-cache/dev-python/pypng-0.0.18
@@ -4,11 +4,11 @@ DESCRIPTION=Pure Python PNG image encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/drj11/pypng https://pypi.org/project/pypng/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypng/pypng-0.0.18.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3c8be63de74e4d2fd24b53237361c8e8
+_md5_=90772fa65356a86bdec39e1392aff449
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
index eada937ab1bd..c174f969bb22 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python QR code generator with SVG, EPS, PNG and terminal outp
 EAPI=6
 HOMEPAGE=https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/
 IUSE=png python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=png? ( dev-python/pypng[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQRCode/PyQRCode-1.2.1.tar.gz -> pyqrcode-1.2.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5dc51d257e694515fe06322f8ec63070
+_md5_=ec3c6b02a548d087e17738fe50dcce80
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
index afbf60dab1d0..f8759f71fa78 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=71b1c66bb87be0bde224acf6782fdb35
+_md5_=ee25ab0544e13ecf24ec0d801058b914
diff --git a/metadata/md5-cache/dev-python/python-utils-2.3.0 b/metadata/md5-cache/dev-python/python-utils-2.3.0
index 32a50e2d2573..69c8d4e98433 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.3.0
+++ b/metadata/md5-cache/dev-python/python-utils-2.3.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest-flakes[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-flakes[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 )
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.3.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ad9a3462887281161a3e245f60b34468
+_md5_=5b4972ffc555083414fd62c8f43c2484
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3.1 b/metadata/md5-cache/dev-python/pytrie-0.3.1
index ec71977ece6f..fd2b2521ad0f 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3.1
+++ b/metadata/md5-cache/dev-python/pytrie-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A pure Python implementation of the trie data structure
 EAPI=6
 HOMEPAGE=https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.1.tar.gz -> pytrie-0.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1054de035f230765e791e86daaab12e7
+_md5_=3f80c3081d8db82df9ca09ae5d1129a3
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2 b/metadata/md5-cache/dev-python/rdflib-4.2.2
index 1676c19d3ea7..d138cb02e36e 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2
@@ -4,11 +4,11 @@ DESCRIPTION=RDF library containing a triple store and parser/serializer
 EAPI=6
 HOMEPAGE=https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/
 IUSE=doc berkdb examples mysql redland sqlite test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/isodate[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] berkdb? ( dev-python/bsddb3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3903094d199f6e904cc9af799db525ab
+_md5_=8de2484d56f1a0dccfb416085a469699
diff --git a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1 b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
index 7433be7d9329..0f97153682a1 100644
--- a/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx extension: auto-generates API docs from Zope interfaces
 EAPI=5
 HOMEPAGE=https://pypi.org/project/repoze.sphinx.autointerface/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=repoze
 RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=513e59bc2bd6f41d7692920f71351b2b
+_md5_=499b9589f2c9f7896c12a03165fb2b6a
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.2 b/metadata/md5-cache/dev-python/sdnotify-0.3.2
index 87f9103d736c..f1f394beca09 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.2
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of systemd's service notification protocol (sd
 EAPI=6
 HOMEPAGE=https://github.com/bb4242/sdnotify https://pypi.org/project/sdnotify/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.3.2.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=90f054e654a03852e98b8ea25ec59fb4
+_md5_=d675a6a9876d922637e60d24dd8bdb0c
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index 6bb53d7e51f5..0086414a9730 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A copy & paste backport of Python 3.3's shutil.which function
 EAPI=6
 HOMEPAGE=https://pypi.org/project/shutilwhich/ https://github.com/mbr/shutilwhich
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-1.1.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=14f2ca4699b04edb2f9dec3bdae45a0f
+_md5_=ff4405a711a0913a9c03218e7f842277
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r2 b/metadata/md5-cache/dev-python/snappy-0.5-r2
index dfe95ba061ba..b4ea75914603 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5-r2
+++ b/metadata/md5-cache/dev-python/snappy-0.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=5
 HOMEPAGE=https://pypi.org/project/python-snappy/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=8ed55561aaf534615624c3a9723a5a8e
+_md5_=fbb31475c7a0b938174314c7babcfbbf
diff --git a/metadata/md5-cache/dev-python/snappy-0.5.1 b/metadata/md5-cache/dev-python/snappy-0.5.1
index 0628f1adfff7..1954d2ac0988 100644
--- a/metadata/md5-cache/dev-python/snappy-0.5.1
+++ b/metadata/md5-cache/dev-python/snappy-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for the snappy compression library from Google
 EAPI=6
 HOMEPAGE=https://pypi.org/project/python-snappy/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=app-arch/snappy-1.0.2:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=34c2a8a6e75951af445f1c7b0499c1f3
+_md5_=afee4fe11c37cdb53220c131d103e762
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
index fa7e8613dca4..c7c2a6c1433a 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Wrapper around a SPARQL service
 EAPI=6
 HOMEPAGE=https://pypi.org/project/SPARQLWrapper/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=W3C
 RDEPEND=>=dev-python/rdflib-2.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cf4e984ffcb2beb722a67da5bfaabf6e
+_md5_=91f4bfeca4eb9970d3f00d14edc815a1
diff --git a/metadata/md5-cache/dev-python/tox-3.10.0 b/metadata/md5-cache/dev-python/tox-3.11.1
similarity index 99%
rename from metadata/md5-cache/dev-python/tox-3.10.0
rename to metadata/md5-cache/dev-python/tox-3.11.1
index c5858590e7aa..9b9bba20ee5b 100644
--- a/metadata/md5-cache/dev-python/tox-3.10.0
+++ b/metadata/md5-cache/dev-python/tox-3.11.1
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=dev-python/filelock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/pluggy-1.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pip[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/py[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/toml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/3.10.0.tar.gz -> tox-3.10.0.tar.gz
+SRC_URI=https://github.com/tox-dev/tox/archive/3.11.1.tar.gz -> tox-3.11.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=029c201f6ea38d8033427d63f37f7769
diff --git a/metadata/md5-cache/dev-python/treq-17.8.0 b/metadata/md5-cache/dev-python/treq-17.8.0
index f6aa87e1af23..fd2a8e6676df 100644
--- a/metadata/md5-cache/dev-python/treq-17.8.0
+++ b/metadata/md5-cache/dev-python/treq-17.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A requests-like API built on top of twisted.web's Agent
 EAPI=6
 HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-17.8.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=89eb072e9f8b95311315784bdae6f017
+_md5_=34c506735db570c98e43c454dae578b2
diff --git a/metadata/md5-cache/dev-python/txaio-2.9.0 b/metadata/md5-cache/dev-python/txaio-2.9.0
index c39b9d2bd7dc..a0650a2b236e 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
 EAPI=6
 HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.9.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d9b7c645582d0f61c6d6a8e15c69b2cc
+_md5_=fd1652ca7023d786016942a6afcaed5c
diff --git a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1 b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
index 405b055ca959..93d89901410e 100644
--- a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
+++ b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Twisted-based Tor controller client, with state-tracking and config
 EAPI=6
 HOMEPAGE=https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
 RDEPEND=dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),crypt] >=dev-python/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/automat[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/repoze-sphinx-autointerface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/txtorcon/txtorcon-0.19.3.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5b7a2b92d67e756e7eec9db1686ed11c
+_md5_=b0b7f9518e7e4f1af04eb8e1d8104e55
diff --git a/metadata/md5-cache/dev-python/watchdog-0.9.0 b/metadata/md5-cache/dev-python/watchdog-0.9.0
index 48a0da7c0716..d449a759dcaa 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.9.0
+++ b/metadata/md5-cache/dev-python/watchdog-0.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python API and shell utilities to monitor file system events
 EAPI=7
 HOMEPAGE=https://github.com/gorakhargosh/watchdog
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/argh[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pathtools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.9.0.tar.gz -> watchdog-0.9.0.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b9ad7984dce20749c4245066e13250d1
+_md5_=fd74a8ec58543d9e9346d448fb72b18b
diff --git a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108 b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
index 423e9fb4f674..a234c019393a 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -4,11 +4,11 @@ DESCRIPTION=Accelerator for ws4py, autobahn and tornado
 EAPI=5
 HOMEPAGE=https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ea7dab1772c842be48b2a1a8f093d318
+_md5_=819fa7cc0d0a5e388be41364fdc1e4ea
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
index a05e8ca5f08e..b3643b0d49e3 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=6
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.9.8.tar.gz test? ( https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_0.9.8.zip -> xlsxwriter-0.9.8-tests.zip )
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=010e7707570e627696616c45f17f028e
+_md5_=d23f9d3e5455b5035fac35d1c3d793ec
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index f5f3f67be381..b0371a7e0c83 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/assistant-5.12.3 b/metadata/md5-cache/dev-qt/assistant-5.12.3
index 9854f77181b4..c88e243a0804 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.12.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qthelp-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=79f0270ebe5372049e7772fb768deedf
+_md5_=237cb1d7fe0fd1e6d28deb890fb633d4
diff --git a/metadata/md5-cache/dev-qt/designer-5.12.3 b/metadata/md5-cache/dev-qt/designer-5.12.3
index e63399232670..80e8ad4f1dbb 100644
--- a/metadata/md5-cache/dev-qt/designer-5.12.3
+++ b/metadata/md5-cache/dev-qt/designer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 declarative? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b0f21e619838dd409029154cfe3f5efb
+_md5_=eb924e950043525dbfb32859aa8140e5
diff --git a/metadata/md5-cache/dev-qt/linguist-5.12.3 b/metadata/md5-cache/dev-qt/linguist-5.12.3
index 09e8caef1c97..cf983e318640 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fb8bbe03cdfbe6987836c71a98c93101
+_md5_=63b4a6386aa05de96284273a3689fa22
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
index cacdc8528f51..3461b515a39c 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtxml-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=9c093e21893380d4f3aa85236e4c0da6
+_md5_=49ec61f1e4e5ee4e58976dca123252d7
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.12.3 b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
index 7f4e0dfcd1e9..3100f3ba29c8 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.12.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d6be7c6e86fe8a1b12632a95bd2ac228
+_md5_=07957ee3401acf1bd4793fcc5fbb7b72
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.12.3 b/metadata/md5-cache/dev-qt/qdbus-5.12.3
index eb3c62f9aca6..2615e8695a0f 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=e5c19a4066a1551f8d75f8ebfb86dad3
+_md5_=97d5cd484e694f163e7afc711abb0369
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
index 1f3727ea1373..f2686d218844 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1a3aa6592e2f47265c7e24d1edcaeea2
+_md5_=da3b16f7d7748923721d514ca278810d
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.12.3 b/metadata/md5-cache/dev-qt/qdoc-5.12.3
index 99cb8ea5cd7e..ac0a2aa6efe5 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cb070a26c58e051f90dcb1f472b3f961
+_md5_=b94791caafb4b231b62595afbef2c8e1
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302 b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
index 71c97acf386f..7fb12c26513f 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
@@ -4,9 +4,9 @@ DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=7
 HOMEPAGE=https://doc.qt.io/
 IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc/5.12.3-0-201904161302qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtcharts/5.12.3-0-201904161302qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtdatavis3d/5.12.3-0-201904161302qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtnetworkauth/5.12.3-0-201904161302qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtvirtualkeyboard/5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtwebengine/5.12.3-0-201904161302qtwebengine-documentation.7z )
-_md5_=0fe0457a5fdbb5e7e9a7cbf3f8a9789d
+_md5_=d4558e39a9a826c599bbbe8c89bbd783
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.12.3 b/metadata/md5-cache/dev-qt/qt3d-5.12.3
index adfee5b6e07a..4ceae63eb107 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.12.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=3D rendering module for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 >=media-libs/assimp-4.0.0 qml? ( ~dev-qt/qtdeclarative-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qt3d-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=53936cc9d8d6242984f352396a556371
+_md5_=457c7cf64977a7f3443ebf079d3caa00
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
index d2e39be575c2..22e89f34fb96 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=8ec4abe4e18413045646a633c0965588
+_md5_=529b269c22c356a07a6db004bffdaa43
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66 b/metadata/md5-cache/dev-qt/qtchooser-66
index 34429fca69a5..6055c540cc03 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66
+++ b/metadata/md5-cache/dev-qt/qtchooser-66
@@ -4,9 +4,9 @@ DESCRIPTION=Tool to quickly switch between multiple Qt installations
 EAPI=7
 HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 SLOT=0
 SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=31daaa44a1f4757781fda993a574327c
+_md5_=e41d1c4a469c55604d310f847a65220f
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
index 1df95c1e11b1..8edc1f1daf9a 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=7828ecf3a6a3e7c3b74c2e2c52b7b351
+_md5_=bab17c864b2ac276f62182b049b65bea
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.12.3 b/metadata/md5-cache/dev-qt/qtcore-5.12.3
index 20387f6ee5ec..b1022e5a5019 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=62e011e02261f00cb3721954c773088d
+_md5_=b5af9192dc13924aa65cd9d83cd995ee
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
index 3e3b04b2cd9e..1c144a643c91 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=3D data visualization library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 qml debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] qml? ( ~dev-qt/qtdeclarative-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdatavis3d-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c91c41a28e6352045b7b2a28baee24bf
+_md5_=1f30d81a0a322cb4de3407720582a85d
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.12.3 b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
index a921a422651d..b83bbc7dffae 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d79af3418f1f71981d56dbefa6be8807
+_md5_=b130afdac410b5347fd12d18152f2b95
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
index d35c43be97e3..b6431f212bf0 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qttest-5.12.3 localstorage? ( ~dev-qt/qtsql-5.12.3 ) widgets? ( ~dev-qt/qtwidgets-5.12.3[gles2=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5321a2084d154cae00b38d7ad1a8b542
+_md5_=3a174163208cf7b410468aff50837a3a
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
index 343ee4033693..fb54978b8b71 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6e88b2b6fd0b4587e9d572a1537eac9f
+_md5_=7a8a59ddae1143ad3e0731e50834ad9d
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1 b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
index 9dff96ed9993..5204e688d347 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.12.3 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.12.3 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.12.3 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.12.3 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=146bf542a4b8e21b0de5a9125d042514
+_md5_=0aaefff1015336279eff491fc52e51a5
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.12.3 b/metadata/md5-cache/dev-qt/qthelp-5.12.3
index 384435148f4e..5199ba2b4e56 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.12.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fc8112e2eb6691f510c5d768780d5060
+_md5_=fd87612d53720609d93bc64f490f439e
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
index bc653fe1adf2..294ad317c311 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=jpeg2k mng debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 jpeg2k? ( media-libs/jasper:= ) mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=ba25c26891ee658bf1bc13370c56c540
+_md5_=5798a54f81e8c2f19d2c61b78e969c50
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.12.3 b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
index 6219b65e26a6..5d1feac6437f 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtpositioning-5.12.3[qml] ~dev-qt/qtsql-5.12.3 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=82cf244287ec4993562750dade210561
+_md5_=d8283709ef2501f66c792c8aaf18fff6
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
index a81a462fa1cb..b35e4e501b39 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.12.3 gles2? ( ~dev-qt/qtgui-5.12.3[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.12.3 ~dev-qt/qtwidgets-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=67f987bc6735b410701f447b0d720ad5
+_md5_=1b30fb3cbda115913ea76b87df13e3bb
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
index 045bbbc54f9e..5aec9110a521 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman libproxy networkmanager sctp +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.12.3 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.12.3 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=eafdaca374a141d67ba10039eb699728
+_md5_=7ba41178dabdf2b18d64c00fca48b9e5
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
index 594dfb00727d..1001c025e6ca 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network authorization library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtnetworkauth-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=3a111ea98172c225f326dc7ef460728d
+_md5_=da53201b14a355e8a577842b44588fe2
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.12.3 b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
index 5daae6b24c76..ab86d0764878 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1c57150ca1d8cdb9e79dd8d6c61c2f12
+_md5_=9f731eacc70386f25dd600b069863b7a
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.12.3 b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
index 078cc003aba3..0322a79dcb10 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=cf6765048b91005d32188a6fe2e90a04
+_md5_=1ceec8ffc67e88929a6b488554f78600
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
index 77666d90d153..f23e9401026f 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue +qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND=~dev-qt/qtcore-5.12.3 geoclue? ( ~dev-qt/qtdbus-5.12.3 ) qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=31b79ad3d0773b2f402af22eb467e7d9
+_md5_=83cd618060a68a59bae9d448695605fb
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
index 8a2df86eabbf..21f4d2ec5f85 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2 test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=57f5ad085f264c0d972ecf2abc755924
+_md5_=451e1e2329792dbf894c6315c7046737
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
index 6fa52c080e5d..625354bfa0e2 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (depreca
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c3fae7a093cd2ebdf16c32bba7864363
+_md5_=0762ebc7504350c3c9b7e233f977f110
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
index 2bea7b34012a..ea019d0aa848 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) ~dev-qt/qtgraphicaleffects-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fedfff200a97b841a770291ee8013bff
+_md5_=544dd37287338575a6a3c358812b05d9
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.12.3 b/metadata/md5-cache/dev-qt/qtscript-5.12.3
index 374e6c864b06..bc81b46d28d7 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 scripttools? ( ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5b8820182f2c47fc43f100891e9b0f8d
+_md5_=f4b83a2b50102f5c75a6182ef94f3c00
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.12.3 b/metadata/md5-cache/dev-qt/qtscxml-5.12.3
index d11ef365bda6..03f7acd7df65 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtscxml-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=fbdc051df65217caf10948ea179db364
+_md5_=393b5b27c510e952d46a08c419289a78
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.12.3 b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
index fd370c656e25..8a452cdc7a7c 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c7db0f4612441fc66451ae3d87783ef8
+_md5_=577c819f306ff185bb85ca04aba1b514
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.12.3 b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
index 6b3f8b6e91bd..b5b87b5174bd 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c2a7e7edbd683c419b3222c057e600fa
+_md5_=89a6216e82d1a7ba6d4fe7e8b00c13a6
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.12.3 b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
index 728532f00039..8362d6fe2035 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c74d5aaa4bd551325ca011692ca070d8
+_md5_=4f9bd9595b969f139e03244475eead1f
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.12.3 b/metadata/md5-cache/dev-qt/qtsql-5.12.3
index 70473215cb01..566d5cc4bfe1 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=c627714ccc277258397b215697dab099
+_md5_=22949c74722d1fda11e6c62cff5d610b
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.12.3 b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
index 887ab5c0e279..d4cb7183305c 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 sys-libs/zlib:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=a06ef2524296fa4bac851ce73670ae92
+_md5_=236156ecb12cbcbd66b9877a1509a90e
diff --git a/metadata/md5-cache/dev-qt/qttest-5.12.3 b/metadata/md5-cache/dev-qt/qttest-5.12.3
index a0c39b670d61..5fe37fc96fd0 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=6d9f5f21a598f3cf87e9407e965764c7
+_md5_=82654b8d261584beafa0539a8061a0cd
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.12.3 b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
index aab6d7bff20b..a582f622d115 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=111169ffcf5dca1be539356958273ddd
+_md5_=25d23b030879f367cc40b57027ae9cbd
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
index b278fcf990bf..53eae841de6e 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Customizable input framework and virtual keyboard for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtsvg-5.12.3 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d24a6c7f15df24ba368357560e2855df
+_md5_=cee795c6a01a844c509098894499de22
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.12.3 b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
index e3bba9173d90..816503370caf 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+libinput xcomposite debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=f4645ea807e4df85ef43cbb898191fe5
+_md5_=912eed7493d207ad3caf0e9afa60c40f
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
index cb1cd1becedb..a7577351bdee 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=1459a065827bed06db1d43d7c1c735ac
+_md5_=41e971285701b4ccd7719e7397e85a25
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
index f78ecd5537a3..0dbb415e2d40 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applica
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwebchannel-5.12.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.3 ) geolocation? ( ~dev-qt/qtpositioning-5.12.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=395c63990f65c0f51756af3a2e4fd422
+_md5_=8d938e7eb7b6fbdbd7045d6e04376ee0
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
index 901a57763c64..58c2457f233b 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3[ssl=] qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=051c69b713eb37976ee6bf0468a930df
+_md5_=cc552133b7e6eaa21f473ba1a161e100
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
index 6f410de8a88e..7ccff43383e0 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.12.3[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=b3f9b8531940ff0776168abbda939a0e
+_md5_=d7579b5c949eeab5c396c91f60f9ce35
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
index 1b1b10ca1723..e9304fbf1d11 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=d51783cc795dbe4f1f416558aa6e4029
+_md5_=0cce5cdca870ffd146162519cf6cc5c9
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.12.3 b/metadata/md5-cache/dev-qt/qtxml-5.12.3
index 3479d20c6e3d..14fb0444b7ce 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=bcf4120de1da275c8b9bb4552ee9edeb
+_md5_=22aa3ad92afd0b47415d7cd74b0239ce
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
index 83bc95de9110..ea351b73fa6f 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	f6c228cbf3a3df9be618ab7e839a29fe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5
-_md5_=5a6b69f3caf4da276aed363552e04f1f
+_md5_=493da7992172c4f343b90781f6eea519
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 243504a49554..2667fca5f613 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/ffi-1.11.1 b/metadata/md5-cache/dev-ruby/ffi-1.11.1
new file mode 100644
index 000000000000..be4f2c3023c3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libffi ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby extension for programmatically loading dynamic libraries
+EAPI=6
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=virtual/libffi ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/ffi/ffi/archive/1.11.1.tar.gz -> ffi-git-1.11.1.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0e616b720257b0a0f759093bc880fbd4
diff --git a/metadata/md5-cache/dev-ruby/haml-rails-2.0.1 b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
new file mode 100644
index 000000000000..a623aeee70bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-rails-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby24] >=dev-ruby/railties-5.1:*[ruby_targets_ruby24] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby24] <dev-ruby/haml-6:*[ruby_targets_ruby24] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25] <dev-ruby/haml-6:*[ruby_targets_ruby25] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26] <dev-ruby/haml-6:*[ruby_targets_ruby26] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rails-5.1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Provides Haml generators for Rails 4
+EAPI=6
+HOMEPAGE=https://github.com/indirect/haml-rails
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby24] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby24] >=dev-ruby/railties-5.1:*[ruby_targets_ruby24] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby24] <dev-ruby/haml-6:*[ruby_targets_ruby24] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby25] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby25] >=dev-ruby/railties-5.1:*[ruby_targets_ruby25] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby25] <dev-ruby/haml-6:*[ruby_targets_ruby25] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/actionpack-5.1:*[ruby_targets_ruby26] >=dev-ruby/activesupport-5.1:*[ruby_targets_ruby26] >=dev-ruby/railties-5.1:*[ruby_targets_ruby26] >=dev-ruby/haml-4.0.6:*[ruby_targets_ruby26] <dev-ruby/haml-6:*[ruby_targets_ruby26] >=dev-ruby/html2haml-1.0.1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/haml-rails-2.0.1.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=fd8d80781226dad5e3f1d94cb14f38d3
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.4 b/metadata/md5-cache/dev-ruby/metasm-1.0.4
new file mode 100644
index 000000000000..4b15dee9f2ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=cross-architecture assembler, disassembler, linker, and debugger
+EAPI=6
+HOMEPAGE=https://metasm.cr0.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1.0.4
+SRC_URI=mirror://rubygems/metasm-1.0.4.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f51e1854a3392de3a1987d1c3171b06a
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.13 b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
index c1ca74d66d56..67bc869aad48 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.13
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:0.12[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby24] ) dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby25] ) dev-ruby/bundler[ruby_targets_ruby25] ) !dev-ruby/packetfu:0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/network_interface:0[ruby_targets_ruby26] dev-ruby/pcaprub:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby24] ) dev-ruby/bundler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby25] ) dev-ruby/bundler[ruby_targets_ruby25] ) ruby_targets_ruby26? ( test? ( >=dev-ruby/rspec-its-1.2.0:1[ruby_targets_ruby26] ) dev-ruby/bundler[ruby_targets_ruby26] ) !dev-ruby/packetfu:0 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A mid-level packet manipulation library
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/packetfu
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:0.12[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:0.12[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/network_interface:0[ruby_targets_ruby24] dev-ruby/pcaprub:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/network_interface:0[ruby_targets_ruby25] dev-ruby/pcaprub:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/network_interface:0[ruby_targets_ruby26] dev-ruby/pcaprub:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1.1.13
 SRC_URI=mirror://rubygems/packetfu-1.1.13.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4d33af41e5bcbecc0291486b5951e0bd
+_md5_=d3c130db2f9dc62eee0fa8eb22ede184
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 1638c6f3fd9b..9b126bcc7684 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ruby-mp3info[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A pure Ruby library for generating podcasts from mp3 files
 EAPI=5
 HOMEPAGE=http://podcast.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/ruby-mp3info[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ruby-mp3info[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ruby-mp3info[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/podcast-0.0.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=663c650559716885685e89b718a63f81
+_md5_=0a54eb6ac5b341488d3cf69146afd251
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3 b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3
new file mode 100644
index 000000000000..fd383e7c947b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby24] <dev-ruby/childprocess-2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby25] <dev-ruby/childprocess-2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby26] <dev-ruby/childprocess-2[ruby_targets_ruby26] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=This gem provides Ruby bindings for WebDriver
+EAPI=6
+HOMEPAGE=https://github.com/seleniumhq/selenium
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby24] <dev-ruby/childprocess-2[ruby_targets_ruby24] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby25] <dev-ruby/childprocess-2[ruby_targets_ruby25] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-0.5[ruby_targets_ruby26] <dev-ruby/childprocess-2[ruby_targets_ruby26] >=dev-ruby/rubyzip-1.2.2:1[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=3
+SRC_URI=mirror://rubygems/selenium-webdriver-3.142.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=2dd8d4e28f538d7a12b8c7fbbf1bfa9f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 19d819fb9f59..eb35c9ba36db 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/bcc-0.9.0-r1 b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
index c25c5dae2f4b..003441af40b4 100644
--- a/metadata/md5-cache/dev-util/bcc-0.9.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and m
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
 IUSE=+luajit kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.9.0.tar.gz -> bcc-0.9.0.tar.gz mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=36979db66a8c46bb4d9245bb627054b2
+_md5_=5ed0daeaeed983bc71cbb912cc1c13ca
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.9-r1 b/metadata/md5-cache/dev-util/bpftrace-0.9-r1
index 9ca46a94e449..78c10fb6ba66 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.9-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.9-r1
@@ -5,11 +5,11 @@ DESCRIPTION=High-level tracing language for eBPF
 EAPI=7
 HOMEPAGE=https://github.com/iovisor/bpftrace
 IUSE=test kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] >=dev-util/bcc-0.9.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.9.tar.gz -> bpftrace-0.9.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7253742f93d9e98006ac66ba2037e1f6
+_md5_=184349bdf042edebd37141a71e6ef60c
diff --git a/metadata/md5-cache/dev-util/bpftrace-9999 b/metadata/md5-cache/dev-util/bpftrace-9999
index bfd4b0d2c913..e80a97b07ca9 100644
--- a/metadata/md5-cache/dev-util/bpftrace-9999
+++ b/metadata/md5-cache/dev-util/bpftrace-9999
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_target
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7253742f93d9e98006ac66ba2037e1f6
+_md5_=184349bdf042edebd37141a71e6ef60c
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.3 b/metadata/md5-cache/dev-util/cmake-3.14.3
index 7506127ab05c..0c4aa8927adf 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.3
+++ b/metadata/md5-cache/dev-util/cmake-3.14.3
@@ -5,10 +5,10 @@ DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt5 test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=60e703998283fa2b8aa31aa8dfc25fde
+_md5_=006eb62231e638ac327f6d5b8f50349c
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.8 b/metadata/md5-cache/dev-util/flawfinder-2.0.8
new file mode 100644
index 000000000000..faf2810458ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.8
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Examines C/C++ source code for security flaws
+EAPI=7
+HOMEPAGE=https://www.dwheeler.com/flawfinder/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.8.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=41b8b779947e0585b0939e643aa7a5d0
diff --git a/metadata/md5-cache/dev-util/goland-2019.1.1 b/metadata/md5-cache/dev-util/goland-2019.1.1
deleted file mode 100644
index b80743e0eaf1..000000000000
--- a/metadata/md5-cache/dev-util/goland-2019.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Golang IDE by JetBrains
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/go
-KEYWORDS=~amd64
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=dev-lang/go
-SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-2019.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a122af185225baf212543870eb10707
diff --git a/metadata/md5-cache/dev-util/goland-2018.3.4 b/metadata/md5-cache/dev-util/goland-2019.1.2
similarity index 91%
rename from metadata/md5-cache/dev-util/goland-2018.3.4
rename to metadata/md5-cache/dev-util/goland-2019.1.2
index 740507f8e7de..2649bbd0fc75 100644
--- a/metadata/md5-cache/dev-util/goland-2018.3.4
+++ b/metadata/md5-cache/dev-util/goland-2019.1.2
@@ -6,6 +6,6 @@ KEYWORDS=~amd64
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=dev-lang/go
 SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-2018.3.4.tar.gz
+SRC_URI=http://download.jetbrains.com/go/goland-2019.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a122af185225baf212543870eb10707
diff --git a/metadata/md5-cache/dev-util/lcov-1.11 b/metadata/md5-cache/dev-util/lcov-1.11
index 0f0d03f5f078..6da3e28d880b 100644
--- a/metadata/md5-cache/dev-util/lcov-1.11
+++ b/metadata/md5-cache/dev-util/lcov-1.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a05a7951589fd1fed85988cac3a39e10
+_md5_=bf93e92e1d4ce0c7e256f8d84e4398fa
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
index 08cdff350c46..b1e0f6a3811b 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.6.0
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 DESCRIPTION=LXQt Build tools
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-build-tools/0.6.0/lxqt-build-tools-0.6.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d20ffdbd9128069c0a4610d3a8b4825a
+_md5_=a693131705fe3c4f87a13a3295b3496a
diff --git a/metadata/md5-cache/dev-util/splint-3.1.2-r2 b/metadata/md5-cache/dev-util/splint-3.1.2-r2
index 75c6452d844b..f2245a8c0460 100644
--- a/metadata/md5-cache/dev-util/splint-3.1.2-r2
+++ b/metadata/md5-cache/dev-util/splint-3.1.2-r2
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.1
 DESCRIPTION=Check C programs for vulnerabilities and programming mistakes
 EAPI=5
 HOMEPAGE=http://lclint.cs.virginia.edu/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.splint.org/downloads/splint-3.1.2.src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d315380f527794c9964f83eb8cbf90f
+_md5_=f2b0ddeec125df082054e89dcbf70084
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 97637f0ee14f..fbd206968bb4 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1 b/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
index 4a8c2896c428..057feac44349 100644
--- a/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-fil
 DESCRIPTION=Common files for development of Gnome packages
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-common
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d89f78cff6a6e6cab85fbe219cb0c2fb
+_md5_=0d0f26ff3c5e5a99e4920b9452beb37e
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2 b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
index 5253aa5109bf..e3bf5bf650b1 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.28.2
@@ -4,11 +4,11 @@ DESCRIPTION=Password and keyring managing daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
 IUSE=+caps pam selinux +ssh-agent test +filecaps test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=app-crypt/pinentry[gnome-keyring]
 RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.28/gnome-keyring-3.28.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=60406be041713520d84da6d211be4d5c
+_md5_=2f6b379de9b550660fd592f4c87c6882
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index af8670b3f98e..98e3259bada8 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/sway-1.1_rc2 b/metadata/md5-cache/gui-wm/sway-1.1_rc3
similarity index 95%
rename from metadata/md5-cache/gui-wm/sway-1.1_rc2
rename to metadata/md5-cache/gui-wm/sway-1.1_rc3
index a53c0d056a4e..23764cbf23a3 100644
--- a/metadata/md5-cache/gui-wm/sway-1.1_rc2
+++ b/metadata/md5-cache/gui-wm/sway-1.1_rc3
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.1-rc2.tar.gz -> sway-1.1_rc2.tar.gz
+SRC_URI=https://github.com/swaywm/sway/archive/1.1-rc3.tar.gz -> sway-1.1_rc3.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=c60b3e3651382762c9d934ec1424eece
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 0fbc25540148..018a7fd580d9 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/discover-5.15.5 b/metadata/md5-cache/kde-plasma/discover-5.15.5
index ec832e8b3870..673b9ce67b87 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.15.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.15.5
@@ -8,7 +8,8 @@ IUSE=+firmware test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/attica-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kcrash-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/kdeclarative-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kitemmodels-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.57.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/discover-5.15.5.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	kde5	d3b1e4258b75eed0a5062295d1758b25	kde5-functions	2dbbfc21b2646d8a3418041b240656a9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=924bce7a2c1eddd7aa5581cf080a9b64
+_md5_=efe29cbe9e8916dfaffe3d49982d0acb
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 3d85780ad92f..3198eb1841ad 100644
Binary files a/metadata/md5-cache/lxqt-base/Manifest.gz and b/metadata/md5-cache/lxqt-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-0.14.1 b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
index 17d21e7b378e..eefd15d0f1b6 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] sys-auth/polkit-qt x11-libs/libX11 x11-libs/libXScrnSaver !lxqt-base/lxqt-l10n
 SLOT=0/0.14
 SRC_URI=https://downloads.lxqt.org/downloads/liblxqt/0.14.1/liblxqt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=46acd66d3ce36d6b52b42609f6309c9b
+_md5_=200a24d8bd07a843001be52c54323959
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.2 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
index 33654de21b78..cf0edfb51870 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.2
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5
 DESCRIPTION=A Qt-based interface to system statistics
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libsysstat/0.4.2/libsysstat-0.4.2.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7e49546974c347cebba11f574489a9d1
+_md5_=5b94eee6b58f40fd1cca2162b52ccfbf
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
index 2e4e25d6f21a..102a8530b061 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-about/0.14.1/lxqt-about-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d2b5d5e4ca5302254388350d28af1cf3
+_md5_=1ba796a6681c03a716176e2e62ff2149
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
index 56a00d2191b1..740179d81cd5 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-b
 DESCRIPTION=LXQt system administration tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* kde-frameworks/kwindowsystem:5 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-admin/0.14.1/lxqt-admin-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b81a942c982349cb8ef4dd2eccd88c28
+_md5_=53d7a7cdcfb65461b67354f77015cb8b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
index 5ecaf3fef66f..3426a126a86b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+monitor +touchpad
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-config/0.14.1/lxqt-config-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a431482fa455dfc22f764a28d20d71ee
+_md5_=290e16fcfffe66ac29ab7889c2d7b407
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
index 2f4c54851597..8fcafbd71124 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 =lxqt-base/liblxqt-0.14* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.14.1/lxqt-globalkeys-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=339cf11a6469dd733b1c2b53560e73d2
+_md5_=a3da441a5cb0a09710d1f4a2d5442265
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
index 6c2729af1a32..c5c51aba2aa0 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+about admin +filemanager lightdm lximage minimal nls +policykit powermanagement processviewer screenshot sddm ssh-askpass sudo terminal +trash
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.14* =lxqt-base/lxqt-globalkeys-0.14* =lxqt-base/lxqt-notificationd-0.14* =lxqt-base/lxqt-panel-0.14* =lxqt-base/lxqt-qtplugin-0.14* =lxqt-base/lxqt-runner-0.14* =lxqt-base/lxqt-session-0.14* virtual/ttf-fonts =x11-themes/lxqt-themes-0.14* about? ( =lxqt-base/lxqt-about-0.14* ) admin? ( =lxqt-base/lxqt-admin-0.14* ) filemanager? ( =x11-misc/pcmanfm-qt-0.14* ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-0.14* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.14* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.14* ) sudo? ( =lxqt-base/lxqt-sudo-0.14* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
 REQUIRED_USE=trash? ( filemanager )
 SLOT=0
-_md5_=32b1c7f105b07a104a531aa6b9763662
+_md5_=fed3fc56291f7c1aa82e29cd64dcc461
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
index ce27624727fb..1b83bfe38ebb 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt notification daemon and library
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-notificationd/0.14.1/lxqt-notificationd-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f626dfa7675f7fbc88f1a4a39d82136a
+_md5_=02328e9eeb74f5c354d5b689b7f0a064
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
index babc397f12ca..c2e1ecb48845 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14*
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-openssh-askpass/0.14.1/lxqt-openssh-askpass-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=94dd561585859425d74cfceb56c3c97c
+_md5_=a3d4719f6c6cc76186b5462665f1a99f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
index f6a9650cb9da..aa3bfa995d7a 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
@@ -5,11 +5,11 @@ DESCRIPTION=LXQt desktop panel and plugins
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-panel/0.14.1/lxqt-panel-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a828a390813f4510dae0d6eccc5436d6
+_md5_=d2f0d832dcab5cab19d95677293096f3
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
index 0fb83b5f220d..45a9053ce99e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-policykit/0.14.1/lxqt-policykit-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=399eca2fa6439f2691ab8435846cd6f5
+_md5_=fefefa1a85c3c99f8f05527d4a724dfe
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
index 3cd5f82ba016..2454f97b090b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt daemon for power management and auto-suspend
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.14* sys-power/upower !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-powermanagement/0.14.1/lxqt-powermanagement-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9849743a55c773a0ee1ba357800d29b6
+_md5_=472430024eefa8c4248be7a51200e5e3
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
index e8a1d3c1d120..a604514295d9 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.14*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-qtplugin/0.14.0/lxqt-qtplugin-0.14.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ea668b1243214576cf0592750b9231d4
+_md5_=5ca569b3ce59477bdb8afdda2acb3cee
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
index 5ddc0865ee67..6ef34b187356 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-
 DESCRIPTION=LXQt quick launcher
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-runner/0.14.1/lxqt-runner-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cda773fbc9c403aab875169f326790c3
+_md5_=4398486a86e6aec5847c92dc82010ed5
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
index ad00f40b4f42..b65cae0ee51b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQT session manager
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+themes +udev
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.14* x11-libs/libX11 x11-misc/xdg-user-dirs themes? ( =x11-themes/lxqt-themes-0.14* ) udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-session/0.14.1/lxqt-session-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1c6d7f3b135cec108a3fc816e33967cd
+_md5_=fdff6862676abcac54692be043ad8730
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
index 09251f7e86fa..b9f2eacdd9a4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.14.1
@@ -4,10 +4,10 @@ DEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt GUI frontend for sudo
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-sudo/0.14.1/lxqt-sudo-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f2401bc4496bba31db173824d27d24b7
+_md5_=4f9ba9a298a9621d0289968575cbc1fb
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 1c4119f2f058..4300f9b1741c 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 2bed0d4add09..da0af4e5f33e 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) zlib? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Qt IMAP e-mail client
 EAPI=7
 HOMEPAGE=http://trojita.flaska.net/
-IUSE=+crypt +dbus debug +password test +zlib test
+IUSE=addressbook +crypt +dbus debug +password +spell test +zlib test
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ffd7501103251bfe4dbcbaed9bb908ae
+_md5_=cd7b6ee57d97cdb47506386b156ffa48
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f643cdcb10b4..96ba60f5add4 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/hugin-2018.0.0 b/metadata/md5-cache/media-gfx/hugin-2018.0.0
deleted file mode 100644
index 0149efa41d7d..000000000000
--- a/metadata/md5-cache/media-gfx/hugin-2018.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GUI for the creation & processing of panoramic images
-EAPI=6
-HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hugin/hugin-2018.0.0.tar.bz2
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=6e10e29380ed8a440ac768e7e1ca6734
diff --git a/metadata/md5-cache/media-gfx/hugin-2019.0.0 b/metadata/md5-cache/media-gfx/hugin-2019.0.0
index 2d6f131756e1..033b39cfd094 100644
--- a/metadata/md5-cache/media-gfx/hugin-2019.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2019.0.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
@@ -10,5 +10,5 @@ RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=med
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2019.0.0.tar.bz2
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=326e60a8600e66aff2cc984535e6eb68
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=33778395e9c4fe51857ffa7797fee84b
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index d74aeea27440..99bcc36fec83 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=92a414f5acec499110d94b5d2a956f75
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	9813bb616cb1bd0c943177ab52204409	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	ed63935305b6de2210ae97a407719d89	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=90e4b87d587e22cf6da400e1b435efeb
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1 b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
index a9c6806d465a..07e80f214792 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=LXImage Image Viewer - GPicView replacement
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lximage-qt/0.14.1/lximage-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a260bd3b12421c1ce45b65a59f35edf9
+_md5_=f81b925262f03c8632306290a9d9591e
diff --git a/metadata/md5-cache/media-libs/Field3D-1.7.2 b/metadata/md5-cache/media-libs/Field3D-1.7.2
index 97c30347466c..8bf2516c7186 100644
--- a/metadata/md5-cache/media-libs/Field3D-1.7.2
+++ b/metadata/md5-cache/media-libs/Field3D-1.7.2
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= virtual/mpi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= mpi? ( virtual/mpi )
 DESCRIPTION=A library for storing voxel data
-EAPI=6
+EAPI=7
 HOMEPAGE=http://opensource.imageworks.com/?p=field3d
+IUSE=mpi
 KEYWORDS=amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= virtual/mpi
+RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://github.com/imageworks/Field3D/archive/v1.7.2.tar.gz -> Field3D-1.7.2.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c0a6716ef339f4177d2b00c9f8798036
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ce1512907851e4670af3927107549ba5
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f534f402edfe..3abf050bb1dc 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/babl-0.1.62 b/metadata/md5-cache/media-libs/babl-0.1.62
index b5e6a94dab6b..fab6ba9b6c25 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.62
+++ b/metadata/md5-cache/media-libs/babl-0.1.62
@@ -4,8 +4,8 @@ DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=7
 HOMEPAGE=http://www.gegl.org/babl/
 IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.62.tar.bz2
-_md5_=7a3af5faade08b2b35c9514bcf85ce74
+_md5_=85df40a66b2482fea211ad67f9814015
diff --git a/metadata/md5-cache/media-libs/codec2-0.7 b/metadata/md5-cache/media-libs/codec2-0.7
deleted file mode 100644
index f86920417661..000000000000
--- a/metadata/md5-cache/media-libs/codec2-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Low bit rate speech codec
-EAPI=6
-HOMEPAGE=https://freedv.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~hppa ~ia64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://freedv.com/wp-content/uploads/sites/8/2017/10/codec2-0.7.tar.xz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=519debfd4719859f8873333e9940efc4
diff --git a/metadata/md5-cache/media-libs/codec2-0.8.1 b/metadata/md5-cache/media-libs/codec2-0.8.1
index 88526169e0f2..3a6248f274ca 100644
--- a/metadata/md5-cache/media-libs/codec2-0.8.1
+++ b/metadata/md5-cache/media-libs/codec2-0.8.1
@@ -4,9 +4,9 @@ DESCRIPTION=Low bit rate speech codec
 EAPI=6
 HOMEPAGE=https://freedv.org/
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://hobbes1069.fedorapeople.org/freetel/codec2/codec2-0.8.1.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=202681e3519fe93420f1b278d58c2511
+_md5_=b4323e267e124e7874d36e0ba2f5ba94
diff --git a/metadata/md5-cache/media-libs/gavl-1.2.0 b/metadata/md5-cache/media-libs/gavl-1.2.0
deleted file mode 100644
index 6cd744e1cf8f..000000000000
--- a/metadata/md5-cache/media-libs/gavl-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815
-DESCRIPTION=library for handling uncompressed audio and video data
-EAPI=4
-HOMEPAGE=http://gmerlin.sourceforge.net
-IUSE=doc
-KEYWORDS=amd64 hppa ppc ~ppc64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmerlin/gavl-1.2.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08f817a40f2dd10a02c474e7809e9b83
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0 b/metadata/md5-cache/media-libs/gavl-1.4.0
deleted file mode 100644
index dfb6010e31d7..000000000000
--- a/metadata/md5-cache/media-libs/gavl-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=library for handling uncompressed audio and video data
-EAPI=5
-HOMEPAGE=http://gmerlin.sourceforge.net
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1688063fb2d677e670fd7c45c219807
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34 b/metadata/md5-cache/media-libs/gegl-0.3.34
index 220bf173f88c..32ce9a7ec15d 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.34
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.46 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5034d0d50ff107a0eb15434dfba1de95
+_md5_=157db19f44620b3aeac8f1ab76c18c2a
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
index 612df21a92fe..0671a3a4bb50 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] >=media-libs/gst-plugins-base-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.4 ) gtk? ( >=media-plugins/gst-plugins-gtk-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b014da4d4359369aba1d9e06e4c3a3dd
+_md5_=b5eacd8e81bbb86bd270ead200cfb82f
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
index 3c11d3296da3..adf6c0821300 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=97b39e2a088d1408b7933182593f5ec4
+_md5_=b549b9a52f310c7c452ffbf9a68cc079
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4 b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
index ab91f1ea4834..802156aba159 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.14.4
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4052b81edcf91a80cbc9c687cd10d8a4
+_md5_=9a45e0ab0ef14f48e89eca0b980b8fc3
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.14.4 b/metadata/md5-cache/media-libs/gstreamer-1.14.4
index b2e5963114fb..65d2e47309cd 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.14.4
+++ b/metadata/md5-cache/media-libs/gstreamer-1.14.4
@@ -4,10 +4,10 @@ DESCRIPTION=Open source multimedia framework
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.14.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=39de1589c114c8154edbbef9b538140b
+_md5_=bef63840506c1ad2def6f271e89389c9
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
index 1e2687f42031..a6af52f45f70 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for rectifying and simulating photographic lens distortions
 EAPI=6
 HOMEPAGE=http://lensfun.sourceforge.net/
 IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib:=
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lensfun/lensfun-0.3.2.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5037bc726d237f9fc145732f8c19d590
+_md5_=b3629cf27ec72e82c6b37f6180bb50b5
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0-r1 b/metadata/md5-cache/media-libs/libaom-1.0.0-r1
index b00ce7979be3..06796a20ec36 100644
--- a/metadata/md5-cache/media-libs/libaom-1.0.0-r1
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=6
 HOMEPAGE=https://aomedia.org
 IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/0
 SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=629cda6cb0e92701adf40a020a93b6ca
+_md5_=c95fcb8f2ef5e410189d16e80e793731
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0-r2 b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
new file mode 100644
index 000000000000..3a2f458fe789
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) amd64-fbsd? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Alliance for Open Media AV1 Codec SDK
+EAPI=6
+HOMEPAGE=https://aomedia.org
+IUSE=doc examples cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+SLOT=0/0
+SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=feaeabb7cbb6aa8b42b30f001dcddea1
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.2-r2 b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
index a55221550e7e..023eef5d3555 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.2-r2
+++ b/metadata/md5-cache/media-libs/lilv-0.24.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for app
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/lilv/
 IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~hppa ~ia64 ~ppc x86
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ~ppc x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.2.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=31b335d3391e0d28e72925c4ce9f06fe
+_md5_=9965a13bec5af5f7167439bc55228109
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r1 b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
index b5d6394ad9bd..ddb46cb1f893 100644
--- a/metadata/md5-cache/media-libs/lv2-1.14.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple but extensible successor of LADSPA
 EAPI=6
 HOMEPAGE=http://lv2plug.in/
 IUSE=doc plugins python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=939cb18f3b91cfb845c7ec4bc01fa6a2
+_md5_=ae6fb7c932dca936c54bb61145fd20d0
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.5 b/metadata/md5-cache/media-libs/mesa-19.0.5
new file mode 100644
index 000000000000..7f193904ea02
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.5.tar.xz
+_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=40f2a6479675e8c4419f618e49912281
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.0_rc3 b/metadata/md5-cache/media-libs/mesa-19.1.0_rc3
new file mode 100644
index 000000000000..cf76fddf53be
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.1.0_rc3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=6
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.0-rc3.tar.xz
+_eclasses_=llvm	f36be95c5bfae7bc8c82a966d3c8324f	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e6ca532e932b6a32c575f6c0b02d0371
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2 b/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
index f3c58451908c..51f7a31764d4 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
@@ -3,10 +3,10 @@ DESCRIPTION=FFmpeg version of headers required to interface with Nvidias codec A
 EAPI=6
 HOMEPAGE=https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=x11-drivers/nvidia-drivers-390.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n8.1.24.2/nv-codec-headers-8.1.24.2.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=d9b45e48b0b55f28383d60b9175980cf
+_md5_=8fa4b6c34dc267c23d28de1f604fbfc2
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1-r1 b/metadata/md5-cache/media-libs/opus-1.3.1-r1
new file mode 100644
index 000000000000..371d844ad71f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opus-1.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=doc? ( app-doc/doxygen media-gfx/graphviz )
+DESCRIPTION=Open codec for interactive speech and music transmission over the Internet
+EAPI=7
+HOMEPAGE=https://opus-codec.org/
+IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=516f9fe6ec7a29df10841521baf328e3
diff --git a/metadata/md5-cache/media-libs/ptex-2.1.28 b/metadata/md5-cache/media-libs/ptex-2.1.28
deleted file mode 100644
index cd2b734e041d..000000000000
--- a/metadata/md5-cache/media-libs/ptex-2.1.28
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib app-doc/doxygen sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Per-Face Texture Mapping for Production Rendering
-EAPI=6
-HOMEPAGE=http://ptex.us/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/wdas/ptex/archive/v2.1.28.tar.gz -> ptex-2.1.28.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=61b90d914173cbaea333a1ae2792598b
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.2 b/metadata/md5-cache/media-libs/ptex-2.3.2
new file mode 100644
index 000000000000..fc8b83ea3de1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ptex-2.3.2
@@ -0,0 +1,15 @@
+BDEPEND=app-doc/doxygen dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Per-Face Texture Mapping for Production Rendering
+EAPI=7
+HOMEPAGE=http://ptex.us/
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wdas/ptex/archive/v2.3.2.tar.gz -> ptex-2.3.2.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e0242848450a9ee2d7cd3c2e3d72ceae
diff --git a/metadata/md5-cache/media-libs/raptor-2.0.15-r2 b/metadata/md5-cache/media-libs/raptor-2.0.15-r2
index d9e79be0a273..d231d9ce13ee 100644
--- a/metadata/md5-cache/media-libs/raptor-2.0.15-r2
+++ b/metadata/md5-cache/media-libs/raptor-2.0.15-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The RDF Parser Toolkit
 EAPI=7
 HOMEPAGE=http://librdf.org/raptor/
 IUSE=+curl debug json static-libs unicode
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt curl? ( net-misc/curl ) json? ( dev-libs/yajl ) unicode? ( dev-libs/icu:= ) !media-libs/raptor:0
 SLOT=2
 SRC_URI=http://download.librdf.org/source/raptor2-2.0.15.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b02ad3fe0c4df2080dd480d54f0393b2
+_md5_=b672f8d3a90a57aac59f898d065a1057
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.0-r1 b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
index 7c7ab67385e6..24d184399a7b 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turt
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sratom/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=ISC
 RDEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=27992b065ba3e7dab28b6196f0e4160b
+_md5_=280d971dfb35726dcc71221e5fc96932
diff --git a/metadata/md5-cache/media-libs/t1lib-5.1.2-r2 b/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
index 9604173da36d..b5181f4c0cf9 100644
--- a/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
+++ b/metadata/md5-cache/media-libs/t1lib-5.1.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A Type 1 Font Rasterizer Library for UNIX/X11
 EAPI=6
 HOMEPAGE=ftp://metalab.unc.edu/pub/Linux/libs/graphics/
 IUSE=X doc static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2 GPL-2
 RDEPEND=X? ( x11-libs/libXaw x11-libs/libX11 x11-libs/libXt )
 SLOT=5
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbf36a37bf03890e51f45ee8f03bfc36
+_md5_=c88ad5683083cdadca3b686fdf330653
diff --git a/metadata/md5-cache/media-libs/woff2-1.0.2-r1 b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
index 82a312a579a0..9491edf6077a 100644
--- a/metadata/md5-cache/media-libs/woff2-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/woff2-1.0.2-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/brotli virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Encode/decode WOFF2 font format
 EAPI=6
 HOMEPAGE=https://github.com/google/woff2
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=app-arch/brotli
 SLOT=0
 SRC_URI=https://github.com/google/woff2/archive/v1.0.2.tar.gz -> woff2-1.0.2.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=bba9f5c6c19309288e31b41c7fe2184a
+_md5_=44ba8da9530f31d25b6d0e15744cfe09
diff --git a/metadata/md5-cache/media-libs/zimg-2.7.5 b/metadata/md5-cache/media-libs/zimg-2.7.5
index 69745df7f92d..ffb897f871d1 100644
--- a/metadata/md5-cache/media-libs/zimg-2.7.5
+++ b/metadata/md5-cache/media-libs/zimg-2.7.5
@@ -1,12 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Scaling, colorspace conversion, and dithering library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-2.7.5.tar.gz -> zimg-2.7.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9635ca24f5317218644eb22aea1b8136
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=4fa6cb64d62fb0fddf982d6183a4c11a
diff --git a/metadata/md5-cache/media-libs/zimg-9999 b/metadata/md5-cache/media-libs/zimg-9999
index 78ce6ecd1627..4019ffb52b84 100644
--- a/metadata/md5-cache/media-libs/zimg-9999
+++ b/metadata/md5-cache/media-libs/zimg-9999
@@ -1,10 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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]
 DESCRIPTION=Scaling, colorspace conversion, and dithering library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 IUSE=static-libs cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=WTFPL-2
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-multilib	d4c92668ddddff2b1da2efb74daa43be	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ecf982f1590acd2b71a1938d1f3a8fe
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b4c1139c34732d93eb6a62b349f78ea9
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index bac0a91922ca..c99d98e2c250 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
index 59fd81477fe7..6d25d36e83b9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.14.4
@@ -4,11 +4,11 @@ DESCRIPTION=Video sink plugin for GStreamer that renders to a GtkWidget
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=+egl gles2 +opengl wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=578642dabb9ce80167abf4aa6152a00b
+_md5_=de8a8e3157db5db6b61c0ff2ff9bc278
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
index 69978cffda2b..fd5cb0be328c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.14.4.4.1.3_p20190329
@@ -4,11 +4,11 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=libav +orc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !libav? ( >=media-video/ffmpeg-4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libav? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.14.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gst-libav-1.14.4-ffmpeg4-patchset.tar.xz libav? ( https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2 )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bc35af76d60a20746cdd6bacc303f8b0
+_md5_=fb8d17b3321265dbd70367affe664725
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
index fe577a0771c1..f967f180f86b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Opus audio parser plugin for GStreamer
 EAPI=6
 HOMEPAGE=https://gstreamer.freedesktop.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,ogg] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.14.4:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gstreamer	b64f69d32993abccfc229979742cc360	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=220efa9bfa85027119e6f226ff9d9de9
+_md5_=3a8755842c89cceebbc973196652f7d3
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 90e710adf5c3..74172d991acb 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/mpd-0.21.9 b/metadata/md5-cache/media-sound/mpd-0.21.9
new file mode 100644
index 000000000000..0546855bafb0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.9
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=adplug? ( media-libs/adplug:= ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.9.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=05a6aeb83486a590d834d8bb3d6d0a25
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
index 07aeb61dbe86..75c5ff86f8ab 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-
 DESCRIPTION=A Pulseaudio mixer in Qt (port of pavucontrol)
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pavucontrol-qt/0.14.1/pavucontrol-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=825b6ac06b440384dbcb9e50f74645af
+_md5_=8c79adf412bdbf42cdc70276e0ff2665
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.0 b/metadata/md5-cache/media-sound/pulseeffects-4.6.1
similarity index 96%
rename from metadata/md5-cache/media-sound/pulseeffects-4.6.0
rename to metadata/md5-cache/media-sound/pulseeffects-4.6.1
index 9f2594853c37..9a39461cb678 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.6.0
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
 SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.0.tar.gz -> pulseeffects-4.6.0.tar.gz
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.1.tar.gz -> pulseeffects-4.6.1.tar.gz
 _eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=1bf66938253abb1c08383ebcdd809057
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 60c8d5460c59..43c00ec42400 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/ffmpeg-4.1.3 b/metadata/md5-cache/media-video/ffmpeg-4.1.3
index 17ef294df6d6..cd78eeea3fdb 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.1.3
+++ b/metadata/md5-cache/media-video/ffmpeg-4.1.3
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 fdk jpeg2k bluray gme gsm mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass lv2 truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9af1d2578c2da995aef16cd76a3f678c
+_md5_=06754ab12695fad4c1ef8884900a33bd
diff --git a/metadata/md5-cache/media-video/smplayer-18.10.0 b/metadata/md5-cache/media-video/smplayer-18.10.0
deleted file mode 100644
index 967780610077..000000000000
--- a/metadata/md5-cache/media-video/smplayer-18.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=https://www.smplayer.eu/
-IUSE=autoshutdown bidi debug mpris
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2+ BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-18.10.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f700cad18bd2e27a2e182e4d0043fcfb
diff --git a/metadata/md5-cache/media-video/smplayer-19.1.0 b/metadata/md5-cache/media-video/smplayer-19.1.0
deleted file mode 100644
index 2d85c7b05457..000000000000
--- a/metadata/md5-cache/media-video/smplayer-19.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-qt/linguist-tools:5
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=https://www.smplayer.eu/
-IUSE=autoshutdown bidi debug mpris
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2+ BSD-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.15.0[libass,X] >=net-misc/youtube-dl-2014.11.26 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-19.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f700cad18bd2e27a2e182e4d0043fcfb
diff --git a/metadata/md5-cache/media-video/smplayer-19.5.0 b/metadata/md5-cache/media-video/smplayer-19.5.0
new file mode 100644
index 000000000000..8d28d32cf7f4
--- /dev/null
+++ b/metadata/md5-cache/media-video/smplayer-19.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
+EAPI=7
+HOMEPAGE=https://www.smplayer.eu/
+IUSE=autoshutdown bidi debug mpris
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=GPL-2+ BSD-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) || ( media-video/mpv[libass,X] media-video/mplayer[bidi?,libass,png,X] )
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smplayer-19.5.0.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=33c61b67f88756ae8f969d724247242b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 81327fd2b0d6..f4aa284bf5b0 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/driftnet-0.1.6_p20090401-r1 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
index 32bbe898a8d4..427d4d14312a 100644
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
+++ b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
-DESCRIPTION=A program which listens to network traffic and picks out images from TCP streams it observes
+DESCRIPTION=Listen to network traffic and pick out images from TCP streams observed
 EAPI=5
 HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
 IUSE=gtk mp3 suid +filecaps
-KEYWORDS=amd64 ppc -sparc x86
+KEYWORDS=amd64 ~arm64 ppc -sparc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg:0 media-libs/giflib:= media-libs/libpng:= ) mp3? ( media-sound/mpg123 )
 SLOT=0
 SRC_URI=mirror://github/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=505e027fe97690df7f57beec9055788c
+_md5_=675e04658105fda7688ec93f67320601
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
index f686d9a4171d..1a6c3bdc2c39 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
 IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=HPND BSD GPL-2
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=019e2e0012920a4fa92d56c4b3ec128b
+_md5_=c8163b649426bb035d6a39c23b5fe83a
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.15.0 b/metadata/md5-cache/net-analyzer/netdata-1.15.0
new file mode 100644
index 000000000000..c4951b459a13
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.15.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen +filecaps kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.15.0.tar.gz -> netdata-1.15.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=de86236a3fa6c3ab78b5c591e614fc1e
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 8a0f956b605a..fc19bb3270a9 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4 b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
index 9866c28b937b..a4581430576d 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.12.3_p4
@@ -5,7 +5,7 @@ DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
 EAPI=7
 HOMEPAGE=http://www.isc.org/software/bind
 IUSE=doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gost? ( || ( =dev-libs/openssl-1.0*[-bindist] ( >=dev-libs/openssl-1.1 dev-libs/gost-engine ) ) ) xml? ( dev-libs/libxml2 ) idn? ( <net-dns/idnkit-2:= ) libidn2? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) seccomp? ( sys-libs/libseccomp ) !<net-dns/bind-9.10.2
 REQUIRED_USE=gost? ( !libressl ssl ) idn? ( !libidn2 ) libidn2? ( !idn )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.isc.org/downloads/file/bind-9.12.3-P4/?version=tar-gz -> bind-9.12.3_p4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=6b17014fc28049f822ed1a3367f510ed
+_md5_=552f8292e3d2ba8c10c65c7db33d7385
diff --git a/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1 b/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
index e183e829decc..5ad67cbb6997 100644
--- a/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
+++ b/metadata/md5-cache/net-dns/ldns-utils-1.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Set of utilities to simplify various dns(sec) tasks
 EAPI=5
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
 IUSE=+dane ecdsa examples gost ssl
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/ldns-1.7.0[dane?,ecdsa?,gost?] examples? ( net-libs/libpcap )
 REQUIRED_USE=ecdsa? ( ssl ) dane? ( ssl ) gost? ( ssl )
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_md5_=5a97c5b2e35bf8aba842c1f210c2ce3f
+_md5_=d92fc867327b37b682b7457278d9c274
diff --git a/metadata/md5-cache/net-dns/pdns-recursor-4.1.13 b/metadata/md5-cache/net-dns/pdns-recursor-4.1.13
new file mode 100644
index 000000000000..7e4fbf8a18d8
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.1.13
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:=
+DESCRIPTION=The PowerDNS Recursor
+EAPI=7
+HOMEPAGE=https://www.powerdns.com/
+IUSE=libressl luajit protobuf snmp sodium systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) protobuf? ( dev-libs/protobuf >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= !<net-dns/pdns-2.9.20-r1
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.1.13.tar.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=06f4ce7baae68ab88ff3ab4826bcfc34
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.1 b/metadata/md5-cache/net-dns/unbound-1.9.1
index 98199cf3e73f..15adf95dd493 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.1
+++ b/metadata/md5-cache/net-dns/unbound-1.9.1
@@ -5,11 +5,11 @@ 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 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=e70d40c9d92b27d16de45ae41852be80
+_md5_=caa523c4ce04b3de62008dd16993ccd1
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 563925fafd06..3ef56c0c38d2 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.0-r4 b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
index afa094c13e75..c630bd62b721 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=6
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json +modern_kernel +readline kernel_linux
-KEYWORDS=~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.9.0.tar.gz -> nftables-0.9.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ac3ec643a13e08ed8abb06bcdad8370f
+_md5_=790435165b25c0386bb08de655147349
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5ac1ee2b4794..4b9466213ba5 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/irssi-1.2.0-r2 b/metadata/md5-cache/net-irc/irssi-1.2.0-r2
index b6cf9ac7eebf..487b451737fa 100644
--- a/metadata/md5-cache/net-irc/irssi-1.2.0-r2
+++ b/metadata/md5-cache/net-irc/irssi-1.2.0-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy libressl
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( >=dev-libs/libressl-2.7.4:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/irssi/irssi/releases/download/1.2.0/irssi-1.2.0.tar.xz
 _eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=e1f84b32a6fda73fb7a9c5e538966e4c
+_md5_=4b30a72b5385aa3fa1d4c4cda11db24b
diff --git a/metadata/md5-cache/net-irc/irssi-9999 b/metadata/md5-cache/net-irc/irssi-9999
index f2330ef36edc..4afc40d9ee62 100644
--- a/metadata/md5-cache/net-irc/irssi-9999
+++ b/metadata/md5-cache/net-irc/irssi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) virtual/pkgconfig dev-lang/perl || ( www-client/lynx www-client/elinks ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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]
 DESCRIPTION=A modular textUI IRC client with IPv6 support
 EAPI=6
 HOMEPAGE=https://irssi.org/
 IUSE=otr +perl selinux socks5 +proxy libressl
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 !net-irc/irssi-otr ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
+RDEPEND=sys-libs/ncurses:0= >=dev-libs/glib-2.6.0 !net-irc/irssi-otr !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) otr? ( >=dev-libs/libgcrypt-1.2.0:0= >=net-libs/libotr-4.1.0 ) perl? ( dev-lang/perl:= ) socks5? ( >=net-proxy/dante-1.1.18 ) selinux? ( sec-policy/selinux-irc ) perl? ( !net-im/silc-client )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=49d96ec98216f5e9a3612b901d232daf
+_md5_=87eca37519a094c930c2ded5f256b786
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a81b77d4a3c8..faa1b76d2f6c 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/c-client-2007f-r6 b/metadata/md5-cache/net-libs/c-client-2007f-r6
index 5f3fdd7fd591..d32f6439ccc2 100644
--- a/metadata/md5-cache/net-libs/c-client-2007f-r6
+++ b/metadata/md5-cache/net-libs/c-client-2007f-r6
@@ -4,10 +4,10 @@ DESCRIPTION=UW IMAP c-client library
 EAPI=6
 HOMEPAGE=http://www.washington.edu/imap/
 IUSE=doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=Apache-2.0
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !net-mail/uw-imap kerberos? ( app-crypt/mit-krb5 )
 SLOT=0
 SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=349cd355fbc173f25e3d5ded896ba2e7
+_md5_=2265d9dbcf0b1d2bc784793f97a08767
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.82 b/metadata/md5-cache/net-libs/gsoap-2.8.84
similarity index 94%
rename from metadata/md5-cache/net-libs/gsoap-2.8.82
rename to metadata/md5-cache/net-libs/gsoap-2.8.84
index 3873f1baa42e..89f233738eaf 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.82
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.84
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.82.zip
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.84.zip
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=77abe83dd717d9d21a181bf20db624f0
diff --git a/metadata/md5-cache/net-libs/libmbim-1.16.2 b/metadata/md5-cache/net-libs/libmbim-1.16.2
index 8ed95c2a798e..0bfd4e90d7b1 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.16.2
+++ b/metadata/md5-cache/net-libs/libmbim-1.16.2
@@ -4,10 +4,10 @@ DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper librar
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/libmbim/
 IUSE=static-libs udev
-KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 udev? ( virtual/libgudev:= )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.16.2.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ecd8a84fbfa537c032396686dc714679
+_md5_=6bd170f3ff46055274f43ab42f415e4b
diff --git a/metadata/md5-cache/net-libs/libqmi-1.20.2 b/metadata/md5-cache/net-libs/libqmi-1.20.2
index b09ca596f4e1..be7b16026ae7 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.20.2
+++ b/metadata/md5-cache/net-libs/libqmi-1.20.2
@@ -4,10 +4,10 @@ DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol h
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/libqmi/
 IUSE=doc +mbim static-libs
-KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32 virtual/libgudev mbim? ( >=net-libs/libmbim-1.14.0 )
 SLOT=0/5.1
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.20.2.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=40bf3029adc8b5c4b816b7396575dd3b
+_md5_=012248c97a30822f2178aa5c654bafce
diff --git a/metadata/md5-cache/net-libs/nodejs-12.1.0 b/metadata/md5-cache/net-libs/nodejs-12.3.0
similarity index 96%
rename from metadata/md5-cache/net-libs/nodejs-12.1.0
rename to metadata/md5-cache/net-libs/nodejs-12.3.0
index 51e6c20ec1f7..437fdd3dd363 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.1.0
+++ b/metadata/md5-cache/net-libs/nodejs-12.3.0
@@ -9,6 +9,6 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.38.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
 SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.1.0/node-v12.1.0.tar.xz
+SRC_URI=https://nodejs.org/dist/v12.3.0/node-v12.3.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=defd041abf29c9ea11851d53703af2b1
diff --git a/metadata/md5-cache/net-libs/nodejs-6.17.0 b/metadata/md5-cache/net-libs/nodejs-6.17.0
deleted file mode 100644
index 984a76992f36..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-6.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.9.0:= sys-libs/zlib icu? ( >=dev-libs/icu-58.2:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.17.0/node-v6.17.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7cbb1108977f7da4a0a8bcd2bd265427
diff --git a/metadata/md5-cache/net-libs/nodejs-8.15.1 b/metadata/md5-cache/net-libs/nodejs-8.15.1
deleted file mode 100644
index 3470c25d1d4e..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.33.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.15.1/node-v8.15.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c56aec677b2827bd2a2d66c196cc462
diff --git a/metadata/md5-cache/net-libs/srt-1.3.2 b/metadata/md5-cache/net-libs/srt-1.3.2
index 81e84a7cbf19..c77de41c2638 100644
--- a/metadata/md5-cache/net-libs/srt-1.3.2
+++ b/metadata/md5-cache/net-libs/srt-1.3.2
@@ -5,10 +5,10 @@ DESCRIPTION=Open-source implementation of the Secure Real-time Transport Protoco
 EAPI=7
 HOMEPAGE=https://github.com/Haivision/srt
 IUSE=gnutls libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=gnutls? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/Haivision/srt/archive/v1.3.2.tar.gz -> srt-1.3.2.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1764ce6405744dbe8c243ea02716c562
+_md5_=288416d77c239d973677acab836b6ebb
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.1 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.1
index a8c5de8d2b75..42149d6c197d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.24.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=https://www.webkitgtk.org
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.48:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.8.0 media-libs/libwebp:= >=dev-libs/glib-2.40:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl !opengl ) gstreamer? ( opengl? ( egl ) ) nsplugin? ( X ) webgl? ( gstreamer || ( gles2 opengl ) ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.1.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=7a3e16a892f2dd1478a8296cec9e7bb4
+_md5_=8bdb05f52b027d1fa9709747a10321a5
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 6bf39fdf5843..f3eb0cebfe6d 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mailfront-2.22 b/metadata/md5-cache/net-mail/mailfront-2.22
new file mode 100644
index 000000000000..2b07f00ffc1e
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailfront-2.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=config configure install postinst
+DEPEND=>=dev-libs/bglibs-2.04 >=net-libs/cvm-0.81
+DESCRIPTION=Mail server network protocol front-ends
+EAPI=7
+HOMEPAGE=https://untroubled.org/mailfront/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/bglibs-2.04 >=net-libs/cvm-0.81 virtual/qmail net-libs/cvm
+SLOT=0
+SRC_URI=https://untroubled.org/mailfront/archive/mailfront-2.22.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=2798b9f59b7852b35887279b6b3de9f4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ef3bfd5264c1..b5c787963283 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/anydesk-5.0.0 b/metadata/md5-cache/net-misc/anydesk-5.0.0
new file mode 100644
index 000000000000..d79a8082c3d8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/anydesk-5.0.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Feature rich multi-platform remote desktop application
+EAPI=7
+HOMEPAGE=https://anydesk.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
+RDEPEND=dev-libs/atk dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/glu media-libs/mesa sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/gtkglext x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-libs/pangox-compat
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-5.0.0-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-5.0.0-i686.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=4d10de76912c35e6d9a81f0d19758270
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2
new file mode 100644
index 000000000000..1a7ec52a0e0c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.2_p2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig
+DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
+EAPI=7
+HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse systemd tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:* sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.2-2.debian.tar.xz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f78c186a099c765f19ba1db9fa03e29a
diff --git a/metadata/md5-cache/net-misc/bird-1.6.6 b/metadata/md5-cache/net-misc/bird-1.6.6
new file mode 100644
index 000000000000..37414010b4b3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-1.6.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug ipv6
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.6.tar.gz
+_md5_=4de1b9d27473facbb571d63786c76fac
diff --git a/metadata/md5-cache/net-misc/bird-2.0.4 b/metadata/md5-cache/net-misc/bird-2.0.4
new file mode 100644
index 000000000000..0741d3fe55d6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.4.tar.gz
+_md5_=5862e2608d0f1332a999130395ac8aa0
diff --git a/metadata/md5-cache/net-misc/crossbar-18.3.1 b/metadata/md5-cache/net-misc/crossbar-18.3.1
index c60dfcd62287..92fcd9c74f71 100644
--- a/metadata/md5-cache/net-misc/crossbar-18.3.1
+++ b/metadata/md5-cache/net-misc/crossbar-18.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Crossbar.io - The Unified Application Router for the twisted framewo
 EAPI=6
 HOMEPAGE=https://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.org/project/crossbar/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm64
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/attrs-17.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/autobahn-18.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bitstring-3.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cbor-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-6.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/hyper-h2-3.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/idna-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/incremental-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.18[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/jinja-2.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/lmdb-0.92[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mistune-0.7.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.3.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/psutil-5.2.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.0.9[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytrie-0.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/py-ubjson-0.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.1.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyqrcode-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sdnotify-0.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/service_identity-17.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setproctitle-1.1.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-36.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/treq-17.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/twisted-17.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txaio-2.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/u-msgpack-2.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/watchdog-0.8.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/txtorcon-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-18.3.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3f7e5c09ac55bd51394a2cfa0b13bfa0
+_md5_=0658beed8a7a7da97f5626e0e149067e
diff --git a/metadata/md5-cache/net-misc/istioctl-1.1.7 b/metadata/md5-cache/net-misc/istioctl-1.1.7
new file mode 100644
index 000000000000..57b50d91f6b0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/istioctl-1.1.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=Istio configuration command line utility
+EAPI=6
+HOMEPAGE=https://github.com/istio/istio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/istio/istio/archive/1.1.7.tar.gz -> istioctl-1.1.7.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=43bd33f86cb18a3d394f50ac495d1fe5
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.14 b/metadata/md5-cache/net-misc/memcached-1.5.14
index a03f159d5630..4e66838bad81 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.14
+++ b/metadata/md5-cache/net-misc/memcached-1.5.14
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=debug sasl seccomp selinux slabs-reassign test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.14.tar.gz https://www.memcached.org/files/old/memcached-1.5.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3946533486cdbde8ab71b42a756a0b52
+_md5_=e9818dd246c4d28f3f01e7b3d9f450b6
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.15 b/metadata/md5-cache/net-misc/memcached-1.5.15
new file mode 100644
index 000000000000..d862a7140e59
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.5.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=6
+HOMEPAGE=http://memcached.org/
+IUSE=debug sasl seccomp selinux slabs-reassign test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.5.15.tar.gz https://www.memcached.org/files/old/memcached-1.5.15.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f42ee145d1136616a54b6d94c7a39bfc
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 c4052730ede5..f6431cd4bd29 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b1e41eda6923dee71f6b7d65949c052d
+_md5_=57bbf005a0c06ecad2075881239ce123
diff --git a/metadata/md5-cache/net-misc/stunnel-5.54 b/metadata/md5-cache/net-misc/stunnel-5.54
new file mode 100644
index 000000000000..5c30b425bc32
--- /dev/null
+++ b/metadata/md5-cache/net-misc/stunnel-5.54
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DESCRIPTION=TLS/SSL - Port Wrapper
+EAPI=6
+HOMEPAGE=http://www.stunnel.org/index.html
+IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.54.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.54.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.54.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.54.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.54.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.54.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.54.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=6c58af20e7330250f86d95a9025e87ee
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.05.20 b/metadata/md5-cache/net-misc/youtube-dl-2019.05.20
new file mode 100644
index 000000000000..4bca6faf0287
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.05.20
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2019.05.20/youtube-dl-2019.05.20.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1d089d955908ec8310c856eb6337ba4a
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index f49cf8660099..7cb04d5a9009 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.5.0 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.0
deleted file mode 100644
index 60d43d8ba36f..000000000000
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy3-5:0 >=virtual/pypy-5:0 ) 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:= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Cross-platform Direct Connect client
-EAPI=6
-HOMEPAGE=https://airdcpp-web.github.io/
-IUSE=nat-pmp +tbb +webui
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-PDEPEND=webui? ( www-apps/airdcpp-webui )
-RDEPEND=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.5.0.tar.gz -> airdcpp-webclient-2.5.0.tar.gz
-_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b757aec589d81a4ad56fd1faa3a116a8
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
similarity index 97%
rename from metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1
rename to metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
index 79138eb66166..88cc1393337c 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.5.1
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
@@ -10,6 +10,6 @@ LICENSE=GPL-2+
 PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=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.5.1.tar.gz -> airdcpp-webclient-2.5.1.tar.gz
+SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.6.1.tar.gz -> airdcpp-webclient-2.6.1.tar.gz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=679b0c9b8c4c62d11f4ee18f1d66d624
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
new file mode 100644
index 000000000000..ce60b94f9e29
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.0.1.tar.gz -> cpuminer-opt-3.9.0.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index b10d5e660450..d880ab94a0b5 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/libreswan-3.28 b/metadata/md5-cache/net-vpn/libreswan-3.28
new file mode 100644
index 000000000000..767b4be23e9b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/libreswan-3.28
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto dev-libs/nss sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-python/setproctitle ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= )
+DESCRIPTION=IPsec implementation for Linux, fork of Openswan
+EAPI=7
+HOMEPAGE=https://libreswan.org/
+IUSE=caps curl dnssec ldap pam seccomp selinux systemd test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 BSD-4 RSA DES
+RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( net-dns/unbound:= net-libs/ldns ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-misc/openswan !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec )
+SLOT=0
+SRC_URI=https://download.libreswan.org/libreswan-3.28.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e34ecda05d8590995525f602e2be83be
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 54c18ae34ae8..8ea3e154c17a 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2 b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
index 1a98201ff1cc..f1db61e39744 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=WLAN tools for breaking 802.11 WEP/WPA keys
 EAPI=7
 HOMEPAGE=http://www.aircrack-ng.org
 IUSE=+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental python_targets_python2_7
-KEYWORDS=amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=kernel_linux? ( net-wireless/iw net-wireless/wireless-tools sys-apps/ethtool sys-apps/usbutils sys-apps/pciutils ) sys-apps/hwids airdrop-ng? ( net-wireless/lorcon[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) netlink? ( dev-libs/libnl:3 ) pcre? ( dev-libs/libpcre ) airdrop-ng? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) airgraph-ng? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
@@ -13,4 +13,4 @@ REQUIRED_USE=airdrop-ng? ( || ( python_targets_python2_7 ) ) airgraph-ng? ( || (
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.5.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f9d279a354a9d42c12fb43f9e46b66db
+_md5_=c8642e7312b8f5d206623ca530a72c41
diff --git a/metadata/md5-cache/net-wireless/crda-3.18-r3 b/metadata/md5-cache/net-wireless/crda-3.18-r3
index 462459723a33..c8471dba6420 100644
--- a/metadata/md5-cache/net-wireless/crda-3.18-r3
+++ b/metadata/md5-cache/net-wireless/crda-3.18-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Central Regulatory Domain Agent for wireless networks
 EAPI=6
 HOMEPAGE=https://wireless.wiki.kernel.org/en/developers/regulatory/crda
 IUSE=gcrypt libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86
 LICENSE=ISC
 RDEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb
 SLOT=0
 SRC_URI=http://linuxwireless.org/download/crda/crda-3.18.tar.xz mirror://kernel/software/network/crda/crda-3.18.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=3765235859adb6bf14ab735c5da9248b
+_md5_=bee8c3b6bb8aa2239163ac52f1990020
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
index 79f1bf440b41..4f3e6d22b4f9 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.4
@@ -3,10 +3,10 @@ DEPEND=virtual/libusb:1 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver
 EAPI=6
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.4.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4d17ce99bde512a60b3f235d4b87cda7
+_md5_=1dfdc4010f6838d449308d69cc02513e
diff --git a/metadata/md5-cache/net-wireless/unifi-5.10.24 b/metadata/md5-cache/net-wireless/unifi-5.10.24
new file mode 100644
index 000000000000..3e3b3b252537
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.10.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.10
+SRC_URI=https://dl.ubnt.com/unifi/5.10.24-fc15f0fdf1/UniFi.unix.zip -> unifi-5.10.24.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=5e190f370a45d8895631b793f7b1ad5a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e02548d3fefa..7c580f381862 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/amd-2.3.1 b/metadata/md5-cache/sci-libs/amd-2.3.1
index 65718353b5d4..bfe46efb2d4a 100644
--- a/metadata/md5-cache/sci-libs/amd-2.3.1
+++ b/metadata/md5-cache/sci-libs/amd-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/amd
 IUSE=doc fortran static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig virtual/fortran
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/amd-2.3.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bcb2473043c5bb59c337689bcb45ad44
+_md5_=ed0899bfbe4916c4c3437bb424a85406
diff --git a/metadata/md5-cache/sci-libs/camd-2.3.1 b/metadata/md5-cache/sci-libs/camd-2.3.1
index dc05db1695d6..2953f5254cd9 100644
--- a/metadata/md5-cache/sci-libs/camd-2.3.1
+++ b/metadata/md5-cache/sci-libs/camd-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library to order a sparse matrix prior to Cholesky factorization
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/camd/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/camd-2.3.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d82734eb603431fe55246d96d773cf28
+_md5_=4f963e7cd877c327880fc34653ad99d0
diff --git a/metadata/md5-cache/sci-libs/ccolamd-2.8.0 b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
index 41988214b47c..760d048b95f7 100644
--- a/metadata/md5-cache/sci-libs/ccolamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/ccolamd-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Constrained Column approximate minimum degree ordering algorithm
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/ccolamd-2.8.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6bf6a488a65bfcfc907d6e807a8df5a
+_md5_=1f4fb5aa01d7d8a123c0a46462a08448
diff --git a/metadata/md5-cache/sci-libs/cholmod-2.1.2 b/metadata/md5-cache/sci-libs/cholmod-2.1.2
index ed68100f5c4e..9f47569d073b 100644
--- a/metadata/md5-cache/sci-libs/cholmod-2.1.2
+++ b/metadata/md5-cache/sci-libs/cholmod-2.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Sparse Cholesky factorization and update/downdate library
 EAPI=5
 HOMEPAGE=http://faculty.cse.tamu.edu/davis/suitesparse.html
 IUSE=cuda doc lapack metis minimal static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )
 RDEPEND=>=sci-libs/amd-2.3 >=sci-libs/colamd-2.8 cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) lapack? ( virtual/lapack ) metis? ( >=sci-libs/camd-2.3 >=sci-libs/ccolamd-2.8 || ( <sci-libs/metis-5 <sci-libs/parmetis-4 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/cholmod-2.1.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6ff7961f5f3325a792e5d73ef199a10
+_md5_=fc5b36431b17f60dfa58a0e515d87cbd
diff --git a/metadata/md5-cache/sci-libs/colamd-2.8.0 b/metadata/md5-cache/sci-libs/colamd-2.8.0
index 805c5fa68547..0f9f21a34b60 100644
--- a/metadata/md5-cache/sci-libs/colamd-2.8.0
+++ b/metadata/md5-cache/sci-libs/colamd-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Column approximate minimum degree ordering algorithm
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/ccolamd/
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/suitesparseconfig
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/colamd-2.8.0.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15725f7f425ef59ab2be189efb8c8a0d
+_md5_=9c45dc40e68fcb1ee470d70378e95295
diff --git a/metadata/md5-cache/sci-libs/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index a043db0e58d3..ba9500691336 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -5,11 +5,11 @@ DESCRIPTION=General purpose library and file format for storing scientific data
 EAPI=7
 HOMEPAGE=http://www.hdfgroup.org/HDF5/
 IUSE=cxx debug examples fortran +hl mpi static-libs szip threads zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=NCSA-HDF
 RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=629d656f343add5f9c157b07de0efc42
+_md5_=54d570de9ddfa54e559a9d8569df0680
diff --git a/metadata/md5-cache/sci-libs/metis-4.0.3 b/metadata/md5-cache/sci-libs/metis-4.0.3
index a119e7df5894..c0e4223d916d 100644
--- a/metadata/md5-cache/sci-libs/metis-4.0.3
+++ b/metadata/md5-cache/sci-libs/metis-4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A package for unstructured serial graph partitioning
 EAPI=5
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/metis/
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.3.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec6019b4a749d8155bd20ef403bc6ddd
+_md5_=c5262613ff40296c4ff879eeab2e688a
diff --git a/metadata/md5-cache/sci-libs/parmetis-4.0.3 b/metadata/md5-cache/sci-libs/parmetis-4.0.3
index 577043bfbc48..574be92c5fb7 100644
--- a/metadata/md5-cache/sci-libs/parmetis-4.0.3
+++ b/metadata/md5-cache/sci-libs/parmetis-4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel (MPI) unstructured graph partitioning library
 EAPI=6
 HOMEPAGE=http://www-users.cs.umn.edu/~karypis/metis/parmetis/
 IUSE=doc double-precision examples int64 mpi openmp pcre static-libs
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=free-noncomm
 RDEPEND=mpi? ( virtual/mpi ) !<sci-libs/metis-5
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz doc? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz ) examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz )
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=97f22a3cb0e4e48480533541e343df61
+_md5_=32a3d7595a80f340309e0caed1474524
diff --git a/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1-r1 b/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1-r1
index 828da91f3b75..e9eda93e7935 100644
--- a/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1-r1
+++ b/metadata/md5-cache/sci-libs/suitesparseconfig-4.2.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Common configurations for all packages in suitesparse
 EAPI=6
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/SuiteSparse_config
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/suitesparseconfig-4.2.1.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=87e62e49cfc2ed07bfb77139cf9ebe79
+_md5_=eef6d03332dab998f51f62e22a57141f
diff --git a/metadata/md5-cache/sci-libs/umfpack-5.6.2 b/metadata/md5-cache/sci-libs/umfpack-5.6.2
index ae4d81af0d8e..02d682b97a9c 100644
--- a/metadata/md5-cache/sci-libs/umfpack-5.6.2
+++ b/metadata/md5-cache/sci-libs/umfpack-5.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Unsymmetric multifrontal sparse LU factorization library
 EAPI=5
 HOMEPAGE=http://www.cise.ufl.edu/research/sparse/umfpack
 IUSE=doc +cholmod static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=sci-libs/amd-1.3 sci-libs/suitesparseconfig virtual/blas cholmod? ( >=sci-libs/cholmod-2[-minimal] )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/umfpack-5.6.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f8312f67b8d7553934f3ca3b12ecd08
+_md5_=792abc70016bcff75bc6a31ce8149053
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 05e8d7383147..805278bc557c 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/lsd-0.14.0 b/metadata/md5-cache/sys-apps/lsd-0.14.0
index df7e7a1b2c93..0bad5e52d7d2 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.14.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.14.0
@@ -4,9 +4,9 @@ DESCRIPTION=A modern ls with a lot of pretty colors and awesome icons
 EAPI=7
 HOMEPAGE=https://github.com/Peltoche/lsd
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.14.0.tar.gz -> lsd-0.14.0.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.44/download -> libc-0.2.44.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.8.1/download -> users-0.8.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	009acb9fc0d496be29570ae200345360	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=90b9d6a54ae0f9328ee4ac2a5d196c9e
+_md5_=ad42ad01969180ef1cbb143a9d4516b2
diff --git a/metadata/md5-cache/sys-apps/ripgrep-11.0.1 b/metadata/md5-cache/sys-apps/ripgrep-11.0.1
index 5c0ebc9675a2..6cf68717290e 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-11.0.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-11.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=a search tool that combines the usability of ag with the raw speed o
 EAPI=7
 HOMEPAGE=https://github.com/BurntSushi/ripgrep
 IUSE=+man pcre debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86
 LICENSE=|| ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/bstr/0.1.2/download -> bstr-0.1.2.crate https://crates.io/api/v1/crates/bytecount/0.5.1/download -> bytecount-0.5.1.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.8/download -> crossbeam-channel-0.3.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.5/download -> crossbeam-utils-0.6.5.crate https://crates.io/api/v1/crates/encoding_rs/0.8.17/download -> encoding_rs-0.8.17.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.6/download -> encoding_rs_io-0.1.6.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.3/download -> globset-0.4.3.crate https://crates.io/api/v1/crates/grep/0.2.4/download -> grep-0.2.4.crate https://crates.io/api/v1/crates/grep-cli/0.1.2/download -> grep-cli-0.1.2.crate https://crates.io/api/v1/crates/grep-matcher/0.1.2/download -> grep-matcher-0.1.2.crate https://crates.io/api/v1/crates/grep-pcre2/0.1.3/download -> grep-pcre2-0.1.3.crate https://crates.io/api/v1/crates/grep-printer/0.1.2/download -> grep-printer-0.1.2.crate https://crates.io/api/v1/crates/grep-regex/0.1.3/download -> grep-regex-0.1.3.crate https://crates.io/api/v1/crates/grep-searcher/0.1.4/download -> grep-searcher-0.1.4.crate https://crates.io/api/v1/crates/ignore/0.4.7/download -> ignore-0.4.7.crate https://crates.io/api/v1/crates/itoa/0.4.3/download -> itoa-0.4.3.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.0/download -> pcre2-0.2.0.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.0/download -> pcre2-sys-0.2.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quote/0.6.12/download -> quote-0.6.12.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.6/download -> regex-automata-0.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/ripgrep/11.0.1/download -> ripgrep-11.0.1.crate https://crates.io/api/v1/crates/ryu/0.2.7/download -> ryu-0.2.7.crate https://crates.io/api/v1/crates/same-file/1.0.4/download -> same-file-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.90/download -> serde-1.0.90.crate https://crates.io/api/v1/crates/serde_derive/1.0.90/download -> serde_derive-1.0.90.crate https://crates.io/api/v1/crates/serde_json/1.0.39/download -> serde_json-1.0.39.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/0.15.31/download -> syn-0.15.31.crate https://crates.io/api/v1/crates/tempfile/3.0.7/download -> tempfile-3.0.7.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.2.7/download -> walkdir-2.2.7.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cargo	009acb9fc0d496be29570ae200345360	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=1b4d8cea1637e48f831ad4df27f07094
+_md5_=91aa378e94534b7deeacd00a37526f2e
diff --git a/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
new file mode 100644
index 000000000000..29f1fe0ca139
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ucspi-ssl-0.99e
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= ) >=sys-apps/sed-4 >=sys-apps/sed-4
+DESCRIPTION=Command-line tools for building SSL client-server applications
+EAPI=7
+HOMEPAGE=https://www.fehcom.de/ipnet/ucspi-ssl.html
+IUSE=bindist perl libressl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) perl? ( dev-lang/perl:= ) sys-apps/ucspi-tcp
+SLOT=0
+SRC_URI=https://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-0.99e.tgz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=a467ae472cd07bea87479fc9c0e67cf3
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 6903f363e154..8c1d0c264b35 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2 b/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
deleted file mode 100644
index ecfa62e6cdc3..000000000000
--- a/metadata/md5-cache/sys-auth/libfprint-0.6.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
-DESCRIPTION=library to add support for consumer fingerprint readers
-EAPI=6
-HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/
-IUSE=debug static-libs vanilla
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libusb:1 dev-libs/glib:2 dev-libs/nss x11-libs/pixman
-SLOT=0
-SRC_URI=https://cgit.freedesktop.org/libfprint/libfprint/snapshot/V_0_6_0.tar.bz2 -> libfprint-0.6.0.tar.bz2 https://dev.gentoo.org/~xmw/libfprint-0.6.0_vfs0050.patch.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=499bdd8559ec32dfc0e4458ef0b47be9
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.99.0 b/metadata/md5-cache/sys-auth/libfprint-0.99.0
index 9546eec261bb..90c4faa36e70 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.99.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.99.0
@@ -5,10 +5,10 @@ DESCRIPTION=library to add support for consumer fingerprint readers
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint
 IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_0_99_0.tar.gz -> libfprint-0.99.0.tar.gz
 _eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=c20143da022411b194ed80bde14567db
+_md5_=c7e242bf826226500772bb9526d9e030
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2
deleted file mode 100644
index f79eb5afda2b..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=5
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.10.2/pam_ssh_agent_auth-0.10.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=21a43ee421a0ee604578a6b4839fd960
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
deleted file mode 100644
index 6bfec6dee418..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=4
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.2/pam_ssh_agent_auth-0.9.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a6e317a0458a4027c80e60812409084
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3
deleted file mode 100644
index d9ad48cae8a0..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=4
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.3/pam_ssh_agent_auth-0.9.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a4e7e51deef79311f937e5d53af8ddd
diff --git a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4 b/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4
deleted file mode 100644
index d170fc6bfd51..000000000000
--- a/metadata/md5-cache/sys-auth/pam_ssh_agent_auth-0.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=virtual/pam dev-libs/openssl dev-lang/perl
-DESCRIPTION=Simple module to authenticate users against their ssh-agent keys
-EAPI=5
-HOMEPAGE=http://pamsshagentauth.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/pam dev-libs/openssl virtual/ssh
-SLOT=0
-SRC_URI=mirror://sourceforge/pamsshagentauth/pam_ssh_agent_auth/v0.9.4/pam_ssh_agent_auth-0.9.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ad7a2cca389945dc96fdc5f854f2ff8
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 5d8f6268b8e2..9305afd1cb05 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.2 b/metadata/md5-cache/sys-cluster/galera-26.4.2
new file mode 100644
index 000000000000..b9dd91f29d6b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.2
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/scons[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
+EAPI=7
+HOMEPAGE=http://galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
+SLOT=0
+SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/galera-26.4.2/src/galera-26.4.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=e23cd5d217a915a72b949e3f918dbc90
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2
new file mode 100644
index 000000000000..09128ae119ad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes API server
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2
new file mode 100644
index 000000000000..815baded44a5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2 b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2
new file mode 100644
index 000000000000..f4bdb8509ef9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Proxy service
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=55aeb7a564b39695fc0cd5bf65ed9902
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2
new file mode 100644
index 000000000000..6d9ceadbffad
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10
+DESCRIPTION=Kubernetes Scheduler
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	8bd74731cafdcdad8f7a63637302e073
+_md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.14.2 b/metadata/md5-cache/sys-cluster/kubeadm-1.14.2
new file mode 100644
index 000000000000..53298d7439f8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=fcb6587694b5f25ab39d19a03f0ab955
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.14.2 b/metadata/md5-cache/sys-cluster/kubectl-1.14.2
new file mode 100644
index 000000000000..f35c4528e844
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.14.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.12 dev-go/go-bindata >=dev-lang/go-1.10
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1967dc9a3a57363631512f7d5e70d87f
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.14.2 b/metadata/md5-cache/sys-cluster/kubelet-1.14.2
new file mode 100644
index 000000000000..bf64c240dd4b
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.11 >=dev-lang/go-1.10 virtual/pkgconfig
+DESCRIPTION=Kubernetes Node Agent
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+IUSE=hardened
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.2.tar.gz -> kubernetes-1.14.2.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=a53524dc91a7f2e22d63c86e967cd156
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 2fa66ac923ec..19461d755338 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/xwmfs-0.82-r1 b/metadata/md5-cache/sys-fs/xwmfs-0.83
similarity index 80%
rename from metadata/md5-cache/sys-fs/xwmfs-0.82-r1
rename to metadata/md5-cache/sys-fs/xwmfs-0.83
index b83b41aa61c4..d0f8637789fd 100644
--- a/metadata/md5-cache/sys-fs/xwmfs-0.82-r1
+++ b/metadata/md5-cache/sys-fs/xwmfs-0.83
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:0= >=x11-libs/libX11-1.6.5
 SLOT=0
-SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.82/xwmfs-0.82-dist.tar.gz -> xwmfs-0.82.tar.gz
-_md5_=861bdb2503f453bd7989f27da27b99c4
+SRC_URI=https://github.com/gerstner-hub/xwmfs/releases/download/v0.83/xwmfs-0.83-dist.tar.gz -> xwmfs-0.83.tar.gz
+_md5_=5a1472622d5b818ffa223e0282f0909a
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 36870a1f8593..ba8991d9067e 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-4.14.120 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
index 23ff39c72c1c..30d927f58bf1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.120
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 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 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 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 )
 RESTRICT=binchecks strip
 SLOT=4.14.120
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-128.base.tar.xz mirror://gentoo/genpatches-4.14-128.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-128.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=10f137ee95a4c88ba498fc633e6b4ef5
+_md5_=d8f48ed1f9e97d1536c31ebb9fd6853d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121
new file mode 100644
index 000000000000..68424a180e1f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.121
@@ -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 4.14 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 ~sh ~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 )
+RESTRICT=binchecks strip
+SLOT=4.14.121
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-129.base.tar.xz mirror://gentoo/genpatches-4.14-129.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-129.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5fa25d4cea0675a874d4af679676122a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
index 7387c886fc25..535c6f5fd852 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.44
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 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 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 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 )
 RESTRICT=binchecks strip
 SLOT=4.19.44
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-45.base.tar.xz mirror://gentoo/genpatches-4.19-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-45.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=bc84eb57d9299369433f502016140e46
+_md5_=cf22b55313d9b9a00a01b78f223dd4e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45
new file mode 100644
index 000000000000..73c64bd7671b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.45
@@ -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 4.19 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 ~sh ~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 )
+RESTRICT=binchecks strip
+SLOT=4.19.45
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-46.base.tar.xz mirror://gentoo/genpatches-4.19-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-46.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=6187a4d8f89634aa9b9a17c97c57c35b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
index 03a62472e929..724691b74754 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.180
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 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 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.180
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-181.base.tar.xz mirror://gentoo/genpatches-4.4-181.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-181.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ab3c35d3e6eaac2fbd498fc896a61bf9
+_md5_=ff869d4dd858a8b4894821589b6854a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
index fb6772b0083d..b30ce85a71bc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.177
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.177
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-182.base.tar.xz mirror://gentoo/genpatches-4.9-182.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-182.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f4099259be2900c0f4526faf1e1259f5
+_md5_=247b56eb8a42c763f3306eddeecc7397
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178
new file mode 100644
index 000000000000..2bf3ce62e2db
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.178
@@ -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 4.9 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 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.178
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-183.base.tar.xz mirror://gentoo/genpatches-4.9-183.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-183.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c69b4ea268f9390623af5df5b6b28c5b
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 65cd40759e2c..ff1a52159143 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -9,4 +9,4 @@ RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_card
 RESTRICT=binchecks strip unknown-license? ( bindist )
 SLOT=0
 _eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=be7a9e4a95d974cd03132bc2e0a50cd5
+_md5_=fecd48d659f88bc1bc0d82f0657376ea
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.121
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.121
index e61a68669d4e..7187fa23e63c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.120
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.121
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 )
 RESTRICT=binchecks strip
-SLOT=4.14.120
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.120.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.121
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.121.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.178
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.178
index e2692a43750a..c3adb34308f4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.177
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.178
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.9.177
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.177.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.178
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.178.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0735ed3208fa..6f14e5f3def3 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/ncurses-6.1_p20181020 b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
new file mode 100644
index 000000000000..25f9666e9e3a
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ncurses-6.1_p20181020
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=console display library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/
+IUSE=ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<=sys-libs/ncurses-5.9-r4:5 !<sys-libs/slang-2.3.2_pre23 !<x11-terms/rxvt-unicode-9.06-r3 !<x11-terms/st-0.6-r1
+SLOT=0/6
+SRC_URI=mirror://gnu/ncurses/ncurses-6.1.tar.gz ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2 https://invisible-mirror.net/archives/ncurses/6.1/ncurses-6.1-20181020-patch.sh.bz2
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=593c3ef7c0a225842f54a4eb32de00ad
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 04acd5ec541b..c5313dbbe429 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.4 b/metadata/md5-cache/sys-process/cronie-1.5.4
index ca59171da3a6..3d11effb3638 100644
--- a/metadata/md5-cache/sys-process/cronie-1.5.4
+++ b/metadata/md5-cache/sys-process/cronie-1.5.4
@@ -5,10 +5,10 @@ DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cr
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
 IUSE=+anacron +inotify pam selinux
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
 LICENSE=ISC BSD BSD-2 GPL-2
 RDEPEND=pam? ( virtual/pam ) anacron? ( !sys-process/anacron elibc_musl? ( sys-libs/obstack-standalone ) ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cron	5ba8300c950866f90ad70a7b2bfddac2	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=0a044ff1203db7a930c7e5934568c766
+_md5_=a3c41e5f97996f95d3cbf08b7e0fcd8f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7212bee1dbe3..8193b9db045c 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/imap-c-client-2 b/metadata/md5-cache/virtual/imap-c-client-2
index 9b8b24fa16ac..856fc99f82e7 100644
--- a/metadata/md5-cache/virtual/imap-c-client-2
+++ b/metadata/md5-cache/virtual/imap-c-client-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for IMAP c-client
 EAPI=6
 IUSE=kerberos ssl
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 RDEPEND=|| ( net-libs/c-client[kerberos=,ssl=] net-mail/uw-imap[kerberos=,ssl=] )
 SLOT=0
-_md5_=980d83fea8fa1082977e129cf7f76d5a
+_md5_=2be219a7b26a2e0425d0b2e9dabe9679
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220
similarity index 78%
rename from metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200
rename to metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220
index 80f69ed0f87c..20735a39b7de 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.200
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.905.220
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( =dev-lang/perl-5.30.0* ~perl-core/Module-CoreList-5.201.905.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.905.200 !>perl-core/Module-CoreList-5.201.905.200-r999
+RDEPEND=|| ( =dev-lang/perl-5.30.0* ~perl-core/Module-CoreList-5.201.905.220 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.905.220 !>perl-core/Module-CoreList-5.201.905.220-r999
 SLOT=0
 _md5_=df9f8dc8b915d37958d833ea4d0911e8
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 46df0f043363..8a5e3a5c5b6e 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.5.1 b/metadata/md5-cache/www-apps/airdcpp-webui-2.5.1
deleted file mode 100644
index fd3b92ade4af..000000000000
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.1
+++ /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.5*
-SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.5.1.tgz
-_md5_=975619bdf7f1e70a45e6ba405bfb2673
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.2 b/metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
similarity index 83%
rename from metadata/md5-cache/www-apps/airdcpp-webui-2.5.2
rename to metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
index 285b9fc0b4ff..b0777656f82f 100644
--- a/metadata/md5-cache/www-apps/airdcpp-webui-2.5.2
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-2.6.1
@@ -4,7 +4,7 @@ EAPI=7
 HOMEPAGE=https://airdcpp-web.github.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-2.5*
+RDEPEND==net-p2p/airdcpp-webclient-2.6*
 SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.5.2.tgz
+SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-2.6.1.tgz
 _md5_=fd200bd5eba867ffc7b6272eeb7487e0
diff --git a/metadata/md5-cache/www-apps/klaus-1.2.2 b/metadata/md5-cache/www-apps/klaus-1.2.2
deleted file mode 100644
index e09e89577a00..000000000000
--- a/metadata/md5-cache/www-apps/klaus-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A simple, easy-to-set-up Git web viewer
-EAPI=6
-HOMEPAGE=https://github.com/jonashaag/klaus/
-IUSE=ctags python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dulwich-0.13.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httpauth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/humanize[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ctags? ( dev-python/python-ctags[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/k/klaus/klaus-1.2.2.tar.gz
-_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a97876284290088e9428e78d005eb587
diff --git a/metadata/md5-cache/www-apps/klaus-1.4.0 b/metadata/md5-cache/www-apps/klaus-1.4.0
new file mode 100644
index 000000000000..200fb002fead
--- /dev/null
+++ b/metadata/md5-cache/www-apps/klaus-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A simple, easy-to-set-up Git web viewer
+EAPI=7
+HOMEPAGE=https://github.com/jonashaag/klaus/
+IUSE=ctags python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httpauth[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/humanize[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ctags? ( dev-python/python-ctags[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/k/klaus/klaus-1.4.0.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e815d0405092bcdeb9dac44f1910bcba
diff --git a/metadata/md5-cache/www-apps/moodle-3.7 b/metadata/md5-cache/www-apps/moodle-3.7
new file mode 100644
index 000000000000..6b8c155ab9ba
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=6
+HOMEPAGE=https://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.1[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.7
+SRC_URI=https://download.moodle.org/stable37/moodle-3.7.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=3cf47f19d7af4f7d21fe0c009658a1db
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 8ea6eb7fff91..d6774761433d 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-60.6.2 b/metadata/md5-cache/www-client/firefox-60.7.0
similarity index 66%
rename from metadata/md5-cache/www-client/firefox-60.6.2
rename to metadata/md5-cache/www-client/firefox-60.7.0
index 649540b60769..f57618d3d9c8 100644
--- a/metadata/md5-cache/www-client/firefox-60.6.2
+++ b/metadata/md5-cache/www-client/firefox-60.7.0
@@ -9,6 +9,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/nss-3.36.7 >=dev-libs/nspr-4.19 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34: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 dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.6.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.6.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.6.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.6.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.6.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.6.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.6.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.6.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.6.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.6.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.6.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.6.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.6.2esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.6.2esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.6.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.6.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.6.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.6.2esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.6.2esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.6.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.6.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.6.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.6.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.6.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.6.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.6.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.6.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.6.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.6.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.6.2esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.6.2esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.6.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.6.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.6.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.6.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.6.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.6.2esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.6.2esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.6.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.6.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.6.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.6.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.6.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.6.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.6.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.6.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.6.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.6.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.6.2esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.6.2esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.6.2esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.6.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.6.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.6.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.6.2esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.6.2esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.6.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.6.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.6.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.6.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.6.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.6.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.6.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.6.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.6.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.6.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.6.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.6.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.6.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.6.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.6.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.6.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.6.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.6.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.6.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.6.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.6.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.6.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.6.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.6.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.6.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.6.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.6.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.6.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.6.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.6.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.6.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.6.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.6.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.6.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.6.2esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.6.2esr/source/firefox-60.6.2esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.7.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.7.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.7.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.7.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.7.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.7.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.7.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.7.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.7.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.7.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.7.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.7.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.7.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.7.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.7.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.7.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.7.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.7.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.7.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.7.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.7.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.7.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.7.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.7.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.7.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.7.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.7.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.7.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.7.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.7.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.7.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.7.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.7.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.7.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.7.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.7.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.7.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.7.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.7.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.7.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.7.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.7.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.7.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.7.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.7.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.7.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.7.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.7.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.7.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.7.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.7.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.7.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.7.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.7.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.7.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.7.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.7.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.7.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.7.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.7.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.7.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.7.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.7.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.7.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.7.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.7.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.7.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.7.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.7.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.7.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.7.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.7.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.7.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.7.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.7.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.7.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.7.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.7.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.7.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.7.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.7.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.7.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.7.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.7.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.7.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.7.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.7.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.7.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.7.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.7.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.7.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.7.0esr/source/firefox-60.7.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a815bcc6b203497dd519fcca1ed419b0
diff --git a/metadata/md5-cache/www-client/firefox-67.0 b/metadata/md5-cache/www-client/firefox-67.0
new file mode 100644
index 000000000000..2cb931631a04
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-67.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 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 dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.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.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.2 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.31.0 >=virtual/rust-1.31.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( dev-lang/nasm ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-GB l10n_en-ZA 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_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_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or 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_tr l10n_uk l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.43 >=dev-libs/nspr-4.21 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 dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.2.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.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.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
+RESTRICT=!bindist? ( bindist )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ach.xpi -> firefox-67.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/af.xpi -> firefox-67.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/an.xpi -> firefox-67.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ar.xpi -> firefox-67.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/as.xpi -> firefox-67.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ast.xpi -> firefox-67.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/az.xpi -> firefox-67.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bg.xpi -> firefox-67.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bn-BD.xpi -> firefox-67.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bn-IN.xpi -> firefox-67.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/br.xpi -> firefox-67.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/bs.xpi -> firefox-67.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ca.xpi -> firefox-67.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cak.xpi -> firefox-67.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cs.xpi -> firefox-67.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/cy.xpi -> firefox-67.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/da.xpi -> firefox-67.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/de.xpi -> firefox-67.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/dsb.xpi -> firefox-67.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/el.xpi -> firefox-67.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/en-GB.xpi -> firefox-67.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/en-ZA.xpi -> firefox-67.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/eo.xpi -> firefox-67.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-AR.xpi -> firefox-67.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-CL.xpi -> firefox-67.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-ES.xpi -> firefox-67.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/es-MX.xpi -> firefox-67.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/et.xpi -> firefox-67.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/eu.xpi -> firefox-67.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fa.xpi -> firefox-67.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ff.xpi -> firefox-67.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fi.xpi -> firefox-67.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fr.xpi -> firefox-67.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/fy-NL.xpi -> firefox-67.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ga-IE.xpi -> firefox-67.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gd.xpi -> firefox-67.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gl.xpi -> firefox-67.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gn.xpi -> firefox-67.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/gu-IN.xpi -> firefox-67.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/he.xpi -> firefox-67.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hi-IN.xpi -> firefox-67.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hr.xpi -> firefox-67.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hsb.xpi -> firefox-67.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hu.xpi -> firefox-67.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/hy-AM.xpi -> firefox-67.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/id.xpi -> firefox-67.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/is.xpi -> firefox-67.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/it.xpi -> firefox-67.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ja.xpi -> firefox-67.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ka.xpi -> firefox-67.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kab.xpi -> firefox-67.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kk.xpi -> firefox-67.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/km.xpi -> firefox-67.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/kn.xpi -> firefox-67.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ko.xpi -> firefox-67.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lij.xpi -> firefox-67.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lt.xpi -> firefox-67.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/lv.xpi -> firefox-67.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mai.xpi -> firefox-67.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mk.xpi -> firefox-67.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ml.xpi -> firefox-67.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/mr.xpi -> firefox-67.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ms.xpi -> firefox-67.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nb-NO.xpi -> firefox-67.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nl.xpi -> firefox-67.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/nn-NO.xpi -> firefox-67.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/or.xpi -> firefox-67.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pa-IN.xpi -> firefox-67.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pl.xpi -> firefox-67.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pt-BR.xpi -> firefox-67.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/pt-PT.xpi -> firefox-67.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/rm.xpi -> firefox-67.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ro.xpi -> firefox-67.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ru.xpi -> firefox-67.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/si.xpi -> firefox-67.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sk.xpi -> firefox-67.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sl.xpi -> firefox-67.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/son.xpi -> firefox-67.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sq.xpi -> firefox-67.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sr.xpi -> firefox-67.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/sv-SE.xpi -> firefox-67.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/ta.xpi -> firefox-67.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/te.xpi -> firefox-67.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/th.xpi -> firefox-67.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/tr.xpi -> firefox-67.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/uk.xpi -> firefox-67.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/uz.xpi -> firefox-67.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/vi.xpi -> firefox-67.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/xh.xpi -> firefox-67.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/zh-CN.xpi -> firefox-67.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/67.0/linux-i686/xpi/zh-TW.xpi -> firefox-67.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/67.0/source/firefox-67.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-67.0-patches-05.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-67.0-patches-05.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	f36be95c5bfae7bc8c82a966d3c8324f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	de4a7cb850530155c3333776cdbe9308	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=5ea42ee4e75a83066a75d3affc0c2d00
diff --git a/metadata/md5-cache/www-client/firefox-bin-60.6.2 b/metadata/md5-cache/www-client/firefox-bin-60.7.0
similarity index 59%
rename from metadata/md5-cache/www-client/firefox-bin-60.6.2
rename to metadata/md5-cache/www-client/firefox-bin-60.7.0
index 706f04dda3ce..6d222b3ca297 100644
--- a/metadata/md5-cache/www-client/firefox-bin-60.6.2
+++ b/metadata/md5-cache/www-client/firefox-bin-60.7.0
@@ -9,6 +9,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 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 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
 RESTRICT=strip mirror
 SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.6.2esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.6.2esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.6.2esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.6.2esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.6.2esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.6.2esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.6.2esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.6.2esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.6.2esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.6.2esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.6.2esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.6.2esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.6.2esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.6.2esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.6.2esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.6.2esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.6.2esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.6.2esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.6.2esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.6.2esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.6.2esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.6.2esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.6.2esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.6.2esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.6.2esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.6.2esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.6.2esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.6.2esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.6.2esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.6.2esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.6.2esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.6.2esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.6.2esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.6.2esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.6.2esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.6.2esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.6.2esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.6.2esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.6.2esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.6.2esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.6.2esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.6.2esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.6.2esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.6.2esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.6.2esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.6.2esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.6.2esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.6.2esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.6.2esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.6.2esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.6.2esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.6.2esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.6.2esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.6.2esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.6.2esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.6.2esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.6.2esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.6.2esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.6.2esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.6.2esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.6.2esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.6.2esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.6.2esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.6.2esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.6.2esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.6.2esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.6.2esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.6.2esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.6.2esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.6.2esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.6.2esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.6.2esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.6.2esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.6.2esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.6.2esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.6.2esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.6.2esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.6.2esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.6.2esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.6.2esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.6.2esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.6.2esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.6.2esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.6.2esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.6.2esr/linux-x86_64/en-US/firefox-60.6.2esr.tar.bz2 -> firefox-bin_x86_64-60.6.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.6.2esr/linux-i686/en-US/firefox-60.6.2esr.tar.bz2 -> firefox-bin_i686-60.6.2.tar.bz2 )
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.7.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.7.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.7.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.7.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.7.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.7.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.7.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.7.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.7.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.7.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.7.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.7.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.7.0esr-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.7.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.7.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.7.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.7.0esr-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.7.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.7.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.7.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.7.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.7.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.7.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.7.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.7.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.7.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.7.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.7.0esr-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.7.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.7.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.7.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.7.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.7.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.7.0esr-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.7.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.7.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.7.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.7.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.7.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.7.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.7.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.7.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.7.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.7.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.7.0esr-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.7.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.7.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.7.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.7.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.7.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.7.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.7.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.7.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.7.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.7.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.7.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.7.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.7.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.7.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.7.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.7.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.7.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.7.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.7.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.7.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.7.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.7.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.7.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.7.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.7.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.7.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.7.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.7.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.7.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.7.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.7.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.7.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.7.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.7.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.7.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.7.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.7.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.7.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.7.0esr-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.7.0esr/linux-x86_64/en-US/firefox-60.7.0esr.tar.bz2 -> firefox-bin_x86_64-60.7.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/60.7.0esr/linux-i686/en-US/firefox-60.7.0esr.tar.bz2 -> firefox-bin_i686-60.7.0.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=a7105819da5c5018fce37c90dc7c32f6
diff --git a/metadata/md5-cache/www-client/firefox-bin-66.0.5 b/metadata/md5-cache/www-client/firefox-bin-66.0.5
deleted file mode 100644
index 6ac9f75183c8..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-66.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip app-arch/unzip
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.org/en-US/firefox/
-IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or 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_tr l10n_uk 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=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 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 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ach.xpi -> firefox-66.0.5-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/af.xpi -> firefox-66.0.5-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/an.xpi -> firefox-66.0.5-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ar.xpi -> firefox-66.0.5-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/as.xpi -> firefox-66.0.5-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ast.xpi -> firefox-66.0.5-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/az.xpi -> firefox-66.0.5-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/bg.xpi -> firefox-66.0.5-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/bn-BD.xpi -> firefox-66.0.5-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/bn-IN.xpi -> firefox-66.0.5-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/br.xpi -> firefox-66.0.5-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/bs.xpi -> firefox-66.0.5-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ca.xpi -> firefox-66.0.5-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/cs.xpi -> firefox-66.0.5-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/cy.xpi -> firefox-66.0.5-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/da.xpi -> firefox-66.0.5-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/de.xpi -> firefox-66.0.5-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/el.xpi -> firefox-66.0.5-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/en-GB.xpi -> firefox-66.0.5-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/en-ZA.xpi -> firefox-66.0.5-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/eo.xpi -> firefox-66.0.5-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/es-AR.xpi -> firefox-66.0.5-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/es-CL.xpi -> firefox-66.0.5-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/es-ES.xpi -> firefox-66.0.5-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/es-MX.xpi -> firefox-66.0.5-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/et.xpi -> firefox-66.0.5-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/eu.xpi -> firefox-66.0.5-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/fa.xpi -> firefox-66.0.5-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/fi.xpi -> firefox-66.0.5-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/fr.xpi -> firefox-66.0.5-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/fy-NL.xpi -> firefox-66.0.5-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ga-IE.xpi -> firefox-66.0.5-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/gd.xpi -> firefox-66.0.5-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/gl.xpi -> firefox-66.0.5-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/gu-IN.xpi -> firefox-66.0.5-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/he.xpi -> firefox-66.0.5-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/hi-IN.xpi -> firefox-66.0.5-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/hr.xpi -> firefox-66.0.5-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/hsb.xpi -> firefox-66.0.5-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/hu.xpi -> firefox-66.0.5-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/hy-AM.xpi -> firefox-66.0.5-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/id.xpi -> firefox-66.0.5-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/is.xpi -> firefox-66.0.5-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/it.xpi -> firefox-66.0.5-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ja.xpi -> firefox-66.0.5-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/kk.xpi -> firefox-66.0.5-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/km.xpi -> firefox-66.0.5-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/kn.xpi -> firefox-66.0.5-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ko.xpi -> firefox-66.0.5-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/lt.xpi -> firefox-66.0.5-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/lv.xpi -> firefox-66.0.5-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/mai.xpi -> firefox-66.0.5-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/mk.xpi -> firefox-66.0.5-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ml.xpi -> firefox-66.0.5-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/mr.xpi -> firefox-66.0.5-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ms.xpi -> firefox-66.0.5-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/nb-NO.xpi -> firefox-66.0.5-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/nl.xpi -> firefox-66.0.5-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/nn-NO.xpi -> firefox-66.0.5-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/or.xpi -> firefox-66.0.5-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/pa-IN.xpi -> firefox-66.0.5-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/pl.xpi -> firefox-66.0.5-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/pt-BR.xpi -> firefox-66.0.5-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/pt-PT.xpi -> firefox-66.0.5-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/rm.xpi -> firefox-66.0.5-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ro.xpi -> firefox-66.0.5-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ru.xpi -> firefox-66.0.5-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/si.xpi -> firefox-66.0.5-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/sk.xpi -> firefox-66.0.5-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/sl.xpi -> firefox-66.0.5-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/son.xpi -> firefox-66.0.5-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/sq.xpi -> firefox-66.0.5-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/sr.xpi -> firefox-66.0.5-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/sv-SE.xpi -> firefox-66.0.5-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/ta.xpi -> firefox-66.0.5-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/te.xpi -> firefox-66.0.5-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/th.xpi -> firefox-66.0.5-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/tr.xpi -> firefox-66.0.5-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/uk.xpi -> firefox-66.0.5-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/uz.xpi -> firefox-66.0.5-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/vi.xpi -> firefox-66.0.5-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/xh.xpi -> firefox-66.0.5-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/zh-CN.xpi -> firefox-66.0.5-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//66.0.5/linux-i686/xpi/zh-TW.xpi -> firefox-66.0.5-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/66.0.5/linux-x86_64/en-US/firefox-66.0.5.tar.bz2 -> firefox-bin_x86_64-66.0.5.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/66.0.5/linux-i686/en-US/firefox-66.0.5.tar.bz2 -> firefox-bin_i686-66.0.5.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=e863b77a75b7475e385dcba66a6ded33
diff --git a/metadata/md5-cache/www-client/firefox-bin-67.0 b/metadata/md5-cache/www-client/firefox-bin-67.0
new file mode 100644
index 000000000000..e1b8359296e4
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-67.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip app-arch/unzip
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/en-US/firefox/
+IUSE=+ffmpeg +pulseaudio selinux startup-notification l10n_ach l10n_af l10n_an l10n_ar l10n_as l10n_ast l10n_az l10n_bg l10n_bn-BD l10n_bn-IN l10n_br l10n_bs l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_en-ZA l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_kk l10n_km l10n_kn l10n_ko l10n_lt l10n_lv l10n_mai l10n_mk l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_nn l10n_or 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_tr l10n_uk 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=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 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 virtual/freedesktop-icon-theme pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ach.xpi -> firefox-67.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/af.xpi -> firefox-67.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/an.xpi -> firefox-67.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ar.xpi -> firefox-67.0-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/as.xpi -> firefox-67.0-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ast.xpi -> firefox-67.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/az.xpi -> firefox-67.0-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/bg.xpi -> firefox-67.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/bn-BD.xpi -> firefox-67.0-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/bn-IN.xpi -> firefox-67.0-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/br.xpi -> firefox-67.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/bs.xpi -> firefox-67.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ca.xpi -> firefox-67.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/cs.xpi -> firefox-67.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/cy.xpi -> firefox-67.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/da.xpi -> firefox-67.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/de.xpi -> firefox-67.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/el.xpi -> firefox-67.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/en-GB.xpi -> firefox-67.0-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/en-ZA.xpi -> firefox-67.0-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/eo.xpi -> firefox-67.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/es-AR.xpi -> firefox-67.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/es-CL.xpi -> firefox-67.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/es-ES.xpi -> firefox-67.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/es-MX.xpi -> firefox-67.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/et.xpi -> firefox-67.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/eu.xpi -> firefox-67.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/fa.xpi -> firefox-67.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/fi.xpi -> firefox-67.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/fr.xpi -> firefox-67.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/fy-NL.xpi -> firefox-67.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ga-IE.xpi -> firefox-67.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/gd.xpi -> firefox-67.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/gl.xpi -> firefox-67.0-gl.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/gu-IN.xpi -> firefox-67.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/he.xpi -> firefox-67.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/hi-IN.xpi -> firefox-67.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/hr.xpi -> firefox-67.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/hsb.xpi -> firefox-67.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/hu.xpi -> firefox-67.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/hy-AM.xpi -> firefox-67.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/id.xpi -> firefox-67.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/is.xpi -> firefox-67.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/it.xpi -> firefox-67.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ja.xpi -> firefox-67.0-ja.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/kk.xpi -> firefox-67.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/km.xpi -> firefox-67.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/kn.xpi -> firefox-67.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ko.xpi -> firefox-67.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/lt.xpi -> firefox-67.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/lv.xpi -> firefox-67.0-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/mai.xpi -> firefox-67.0-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/mk.xpi -> firefox-67.0-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ml.xpi -> firefox-67.0-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/mr.xpi -> firefox-67.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ms.xpi -> firefox-67.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/nb-NO.xpi -> firefox-67.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/nl.xpi -> firefox-67.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/nn-NO.xpi -> firefox-67.0-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/or.xpi -> firefox-67.0-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/pa-IN.xpi -> firefox-67.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/pl.xpi -> firefox-67.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/pt-BR.xpi -> firefox-67.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/pt-PT.xpi -> firefox-67.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/rm.xpi -> firefox-67.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ro.xpi -> firefox-67.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ru.xpi -> firefox-67.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/si.xpi -> firefox-67.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/sk.xpi -> firefox-67.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/sl.xpi -> firefox-67.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/son.xpi -> firefox-67.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/sq.xpi -> firefox-67.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/sr.xpi -> firefox-67.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/sv-SE.xpi -> firefox-67.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/ta.xpi -> firefox-67.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/te.xpi -> firefox-67.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/th.xpi -> firefox-67.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/tr.xpi -> firefox-67.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/uk.xpi -> firefox-67.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/uz.xpi -> firefox-67.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/vi.xpi -> firefox-67.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/xh.xpi -> firefox-67.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/zh-CN.xpi -> firefox-67.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases//67.0/linux-i686/xpi/zh-TW.xpi -> firefox-67.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/67.0/linux-x86_64/en-US/firefox-67.0.tar.bz2 -> firefox-bin_x86_64-67.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/mozilla.org/firefox/releases/67.0/linux-i686/en-US/firefox-67.0.tar.bz2 -> firefox-bin_i686-67.0.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e863b77a75b7475e385dcba66a6ded33
diff --git a/metadata/md5-cache/www-client/opera-beta-60.0.3255.60 b/metadata/md5-cache/www-client/opera-beta-60.0.3255.103
similarity index 83%
rename from metadata/md5-cache/www-client/opera-beta-60.0.3255.60
rename to metadata/md5-cache/www-client/opera-beta-60.0.3255.103
index 638cc80ab60d..9d68f5f7c978 100644
--- a/metadata/md5-cache/www-client/opera-beta-60.0.3255.60
+++ b/metadata/md5-cache/www-client/opera-beta-60.0.3255.103
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download2.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download3.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb https://download4.operacdn.com/pub/opera-beta/60.0.3255.60/linux/opera-beta_60.0.3255.60_amd64.deb )
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download2.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download3.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb https://download4.operacdn.com/pub/opera-beta/60.0.3255.103/linux/opera-beta_60.0.3255.103_amd64.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=47af986f1f644ed51df72f6081777ae9
diff --git a/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1 b/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1
deleted file mode 100644
index 5d9121a8cd4c..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.5.1525.41_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_amd64.deb -> vivaldi-2.5.1525.41_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_armhf.deb -> vivaldi-2.5.1525.41_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.5.1525.41-1_i386.deb -> vivaldi-2.5.1525.41_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 19bd4fe2c005..5c11f5ce34d4 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/apache-2.4.39 b/metadata/md5-cache/www-servers/apache-2.4.39
index dcfe6f731720..bd5d3564e5e9 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.39
+++ b/metadata/md5-cache/www-servers/apache-2.4.39
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=+suexec-caps suexec-syslog ssl debug doc gdbm ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.39
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.39.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
 _eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77e306ed0e0d13b8f8bf1e02b6502514
+_md5_=1677a9e54cab16486f247541cd0e87d0
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.12-r1 b/metadata/md5-cache/www-servers/nginx-1.15.12-r1
deleted file mode 100644
index 9d79c3d16a65..000000000000
--- a/metadata/md5-cache/www-servers/nginx-1.15.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.15.12.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=311b79e8e4cb91c44fe2787ceaf1a2ed
diff --git a/metadata/md5-cache/www-servers/nginx-1.16.0 b/metadata/md5-cache/www-servers/nginx-1.16.0-r1
similarity index 96%
rename from metadata/md5-cache/www-servers/nginx-1.16.0
rename to metadata/md5-cache/www-servers/nginx-1.16.0-r1
index fb73771d67a1..2463f1a37e50 100644
--- a/metadata/md5-cache/www-servers/nginx-1.16.0
+++ b/metadata/md5-cache/www-servers/nginx-1.16.0-r1
@@ -4,13 +4,13 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=6
 HOMEPAGE=https://nginx.org
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
 RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.16.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.1.tar.gz -> njs-0.3.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SRC_URI=https://nginx.org/download/nginx-1.16.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=77081d6718148c123c91552195d23974
+_md5_=2c3aad0fc13c16b3121f1cb3efa245e6
diff --git a/metadata/md5-cache/www-servers/nginx-1.14.2-r4 b/metadata/md5-cache/www-servers/nginx-1.17.0
similarity index 93%
rename from metadata/md5-cache/www-servers/nginx-1.14.2-r4
rename to metadata/md5-cache/www-servers/nginx-1.17.0
index dc7e667fb96d..1b69979e99d6 100644
--- a/metadata/md5-cache/www-servers/nginx-1.14.2-r4
+++ b/metadata/md5-cache/www-servers/nginx-1.17.0
@@ -4,13 +4,13 @@ DESCRIPTION=Robust, small and high performance http and reverse proxy server
 EAPI=6
 HOMEPAGE=https://nginx.org
 IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
 PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( dev-lang/luajit:2= ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_stream_geoip? ( dev-libs/geoip ) nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
 REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( luajit nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
 RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.14.2.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.8.tar.gz -> njs-0.2.8.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.14.tar.gz -> ngx_http_lua-0.10.14.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.8.tar.gz -> njs-0.2.8.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.17.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.3.tar.gz -> ngx_http_fancyindex-0.4.3.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.56.tar.gz -> ngx_http_naxsi-0.56.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz -> ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.2.tar.gz -> njs-0.3.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bd43bfa14acab6666c57b1feb094a990
+_md5_=f17cad01330f3136080da388e9fc9a82
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index cd6c5386aedb..1f868d5b7ef4 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/luit-20190106 b/metadata/md5-cache/x11-apps/luit-20190106
new file mode 100644
index 000000000000..53c878e4a19c
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/luit-20190106
@@ -0,0 +1,12 @@
+BDEPEND=sys-apps/groff
+DEFINED_PHASES=configure
+DEPEND=sys-libs/zlib virtual/libiconv
+DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
+EAPI=7
+HOMEPAGE=https://invisible-island.net/luit/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=sys-libs/zlib virtual/libiconv
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/luit/luit-20190106.tgz
+_md5_=fcc9a733afe5d91b92d0f925b25533d2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1627822968b4..8f9e237e14be 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/libfm-qt-0.14.1-r1 b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
index f63c9266d9f5..9ba4189c9d76 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Qt port of libfm, a library providing components to build desktop file managers
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0 media-libs/libexif:= x11-libs/libxcb:= !lxqt-base/lxqt-l10n
 SLOT=0/5
 SRC_URI=https://downloads.lxqt.org/downloads/libfm-qt/0.14.1/libfm-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fce7ae3b35b3ac60baedf7e581649eeb
+_md5_=79b06230a19318dfe1f374e754ecdaae
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 4d9423510f6f..3bff50d13392 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/obconf-qt-0.14.1 b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
index e84f2de8d79f..a50d414daff3 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Openbox window manager configuration tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/sed x11-wm/openbox:3 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/obconf-qt/0.14.1/obconf-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d1e97d45bdd122597c5da19ad1c66ce7
+_md5_=60748db56320cf0c182faf97f3679fb6
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
index 5ff1848a8126..349f60c6768b 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtw
 DESCRIPTION=Fast lightweight tabbed filemanager (Qt port)
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.14* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/pcmanfm-qt/0.14.1/pcmanfm-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=da2cae7a019c5e4d6b7a7923107162c9
+_md5_=78c3c30c77fc9b779a7e902d49755d02
diff --git a/metadata/md5-cache/x11-misc/qps-1.10.20 b/metadata/md5-cache/x11-misc/qps-1.10.20
index 67d00d0304b8..a56a64507a20 100644
--- a/metadata/md5-cache/x11-misc/qps-1.10.20
+++ b/metadata/md5-cache/x11-misc/qps-1.10.20
@@ -5,10 +5,10 @@ DESCRIPTION=Visual process manager - Qt version of ps/top
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qps/1.10.20/qps-1.10.20.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=cc60b4e979ce2b1ad29eba633d54779f
+_md5_=8ec55a9f7f9076135a017dfd7d0cc4a4
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16
deleted file mode 100644
index 5e854ca26721..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A VNC server for real X displays
-EAPI=6
-HOMEPAGE=https://libvnc.github.io/
-IUSE=crypt fbcon libressl ssl xinerama zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xinerama? ( x11-libs/libXinerama ) zeroconf? ( >=net-dns/avahi-0.6.4 )
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=0eecb024807ebf6da42524e2b5303c3d
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1
deleted file mode 100644
index f34b9ac84651..000000000000
--- a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=net-libs/libvncserver-0.9.8[ssl?] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A VNC server for real X displays
-EAPI=6
-HOMEPAGE=https://libvnc.github.io/
-IUSE=crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk:0
-SLOT=0
-SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-snapshot	b77011b62e2053c646ad720defe6d921
-_md5_=d4c2efa80c06eec90fdf78465214d2ac
diff --git a/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2 b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
new file mode 100644
index 000000000000..8c1577b220a1
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/x11vnc-0.9.16-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=>=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) x11-base/xorg-proto x11-libs/libXt
+DESCRIPTION=VNC server for real X displays
+EAPI=7
+HOMEPAGE=https://libvnc.github.io/
+IUSE=crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) zeroconf? ( >=net-dns/avahi-0.6.4 ) dev-lang/tk:0
+SLOT=0
+SRC_URI=https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz -> x11vnc-0.9.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b6bebb269094cf41b6cb9d3122bb54cc
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 73cdd3452daa..3aa39002bb26 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
index f0e8f370ae42..1a0c2c521bd2 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Themes, graphics and icons for LXQt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-themes/0.14.0/lxqt-themes-0.14.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=199d8f54617fefb080c55d7f45bdef99
+_md5_=05552f00fdeb70bf5d0ef06fc6a0ba59
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 59d9d833011f..2ddf4ebd3cf8 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.3 b/metadata/md5-cache/x11-wm/enlightenment-0.22.3
deleted file mode 100644
index c127780ebd90..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) connman? ( net-misc/connman ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( =dev-libs/efl-1.20*[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Enlightenment window manager
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=acpi connman doc nls pam systemd udisks wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_battery +enlightenment_modules_bluez4 +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_luncher +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_packagekit +enlightenment_modules_pager +enlightenment_modules_pager-plain +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_sysinfo +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_vkbd +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-buffer +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/efl-1.20.5[eet,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) connman? ( net-misc/connman ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( =dev-libs/efl-1.20*[drm,wayland] >=dev-libs/wayland-1.12.0 x11-libs/libxkbcommon x11-libs/pixman )
-SLOT=0.17/0.22.3
-SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.3.tar.xz
-_eclasses_=meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f114fc0774af642ba38e08d61a7bfe13
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index aeec1bf6fbaa..9f3cd35d78db 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 20 May 2019 20:38:47 +0000
+Wed, 22 May 2019 15:08:51 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index c5e7a9fc4d27..f35a291b4b14 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3016,7 +3016,7 @@
   </project>
   <project>
     <email>riscv@gentoo.org</email>
-    <name>RISC-V project</name>
+    <name>Gentoo Linux RISC-V development</name>
     <url>https://wiki.gentoo.org/wiki/Project:RISC-V</url>
     <description>RISC-V architecture support project</description>
     <member>
diff --git a/metadata/timestamp b/metadata/timestamp
index 88a8781f62c0..a1e3769f969d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon May 20 20:38:47 UTC 2019
+Wed May 22 15:08:51 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 47d8746e50bf..bcbe8e66304f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 20 May 2019 21:00:01 +0000
+Wed, 22 May 2019 15:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1cf14a5d84a8..4d54cea530bb 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-23d7be1ecd21effe13d0f62fbf0bce628a3699ac 1558384323 2019-05-20T20:32:03+00:00
+d4823b4f764a905fc5cab7d8bac5a340ee1a79e7 1558537376 2019-05-22T15:02:56+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1ef9dcd4c36e..991bb9f1a15a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1558384501 Mon 20 May 2019 08:35:01 PM UTC
+1558537501 Wed 22 May 2019 03:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index aeec1bf6fbaa..9f3cd35d78db 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 20 May 2019 20:38:47 +0000
+Wed, 22 May 2019 15:08:51 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c203042796ca..cdca07833c05 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
index 8479e85a6794..45f81624b3e1 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils fcaps flag-o-matic toolchain-funcs
 
-DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
+DESCRIPTION="Listen to network traffic and pick out images from TCP streams observed"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
 SRC_URI="mirror://github/rbu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc -sparc x86"
+KEYWORDS="amd64 ~arm64 ppc -sparc x86"
 SLOT="0"
 IUSE="gtk mp3 suid"
 
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index b550562148c8..7ce599e67a90 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.}
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 1c016c00eebc..9d78c3a79938 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,2 +1,3 @@
 DIST netdata-1.13.0.tar.gz 3095581 BLAKE2B 0149600d308717ce8bdab2af6b4b0403a762fff15c62cf61a94141c0a73f8867cde265a2065e6f1e42cee7291375a7c33a3eff804017d40146d5ecba6f5414a8 SHA512 dddd0005b746429255601e284f498072560bb62c4875a17a731d8e47c3c168c4934476f46eefc7b0deafb54490fcbb6e5ea97aac51a0461f7a63f34d3770c250
 DIST netdata-1.14.0.tar.gz 3116199 BLAKE2B 366fdd7fc94799f170a2957e26fadfacd0cc71ae22f1ac2390633fc2e9d48b2f725ec1f87cc21096d2ed8a948e1dfcfc5d9e90540ad3ef93fd918569a387a64f SHA512 7e4d9eb171eadd0d2b553a6ac7345a7f1ec368f22fa0d1d67b6430e2b388be5d06a1464b539b9b44c07a5440dab58ece5605c44b279889d9e4bf696102b01b25
+DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b8b965c484a03d5f72a55b39d55b150ada7784a971897a365ff9ebeb9bb66cadc72d4ce33dbc1465a758321d4104 SHA512 34b783d3b550c8ac5dc22e08f30fe87de65a5cd97008e271d9328d09b59620a6807ca3daa81a2e49d7ddf1c015f868b21f4118700b2630dcb78c4f9feda3fe4d
diff --git a/net-analyzer/netdata/netdata-1.15.0.ebuild b/net-analyzer/netdata/netdata-1.15.0.ebuild
new file mode 100644
index 000000000000..54d150969d3c
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.15.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		$(use_enable cups plugin-cups) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index bb7efc477510..07a3531c992f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
index d32063eaa873..29540d5b0f5d 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
index 9fe878c5d5bc..9d5a0611c2f2 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 4a803d1b5423..d631555cc5b0 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,2 +1,3 @@
 DIST pdns-recursor-4.1.11.tar.bz2 1239986 BLAKE2B 33c9b2a2f811c43b67ad2bddf5a11d5d95cc88679d46ba3513f3eeec97bf7694af493a9fea4f733f003056b5f0fc971112e9062883324102ecca28838e2f3e41 SHA512 6041d31f0a517786f44a7fa22c7bfa94d5d4bdc3a7f349d2b47bc66be87404fe8eaf76f45ca18ef8ab96a45c0271f46fdba93a51fbda2542a3ad96e10f51c1d1
 DIST pdns-recursor-4.1.12.tar.bz2 1245110 BLAKE2B 187fe117ab64f234d144d7e2d91a119afe1d6b0a45079f1f9527724081c64f594c8c5d5b4dbc6e25b4beef1fcdfb3e5caed8e5a434921bf6b66e07617d0fb6f9 SHA512 d228976937ede7e9f6b3375e573f5b436d9df7ae246e411b13acb095a1a58f12173b663acc364ce0fbdcc61b3d5522e101472a88da8f044e44541564f9915d9e
+DIST pdns-recursor-4.1.13.tar.bz2 1246775 BLAKE2B ec664baa9d98dde179f15777fb83817706770a88e08dfb61bf8bc9f1fcbd1e6e6064e44bda90da2d82ef4d15e33e0656cd6624c38b3922b5c662610085319164 SHA512 3b64caf291b80e1b0d024d607fc7e0fe8d51450a687a1090f0d0f7aab1a42a73fb31576a0acfddcee3f9c476f8bb0ac192a937f9c3481bef8031d34866b5f430
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
new file mode 100644
index 000000000000..c054da53ceed
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.1.13.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="The PowerDNS Recursor"
+HOMEPAGE="https://www.powerdns.com/"
+SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libressl luajit protobuf snmp sodium systemd"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	systemd? ( sys-apps/systemd:0= )
+	snmp? ( net-analyzer/net-snmp )
+	sodium? ( dev-libs/libsodium:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:= )
+	>=dev-libs/boost-1.35:="
+RDEPEND="${DEPEND}
+	!<net-dns/pdns-2.9.20-r1"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		$(use_enable systemd) \
+		$(use_enable sodium libsodium) \
+		$(use_with !luajit lua) \
+		$(use_with luajit luajit) \
+		$(use_with protobuf) \
+		$(use_with snmp net-snmp)
+}
+
+src_install() {
+	default
+
+	mv "${D}"/etc/powerdns/recursor.conf{-dist,}
+
+	# set defaults: setuid=nobody, setgid=nobody
+	sed -i \
+		-e 's/^# set\([ug]\)id=$/set\1id=nobody/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r1 pdns-recursor
+
+	keepdir /var/lib/powerdns
+}
+
+pkg_postinst() {
+	local old
+
+	for old in ${REPLACING_VERSIONS}; do
+		ver_test ${old} -lt 4.0.0-r1 || continue
+
+		ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor"
+		ewarn "to pdns-recursor, please update your runlevels accordingly."
+
+		break
+	done
+}
diff --git a/net-dns/unbound/unbound-1.9.1.ebuild b/net-dns/unbound/unbound-1.9.1.ebuild
index 6ae0e2e35b3e..8dde19fcab96 100644
--- a/net-dns/unbound/unbound-1.9.1.ebuild
+++ b/net-dns/unbound/unbound-1.9.1.ebuild
@@ -13,7 +13,7 @@ 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 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index b09159328102..dde23eeec2b1 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/nftables/nftables-0.9.0-r4.ebuild b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
index 6578419d4fef..0529f229347c 100644
--- a/net-firewall/nftables/nftables-0.9.0-r4.ebuild
+++ b/net-firewall/nftables/nftables-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 IUSE="debug doc +gmp json +modern_kernel +readline"
 
 RDEPEND=">=net-libs/libmnl-1.0.3:0=
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ebdf13c324fa..51db9a4420dc 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/irssi/irssi-1.2.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild
index 3fd4c3836773..83dffcd5041b 100644
--- a/net-irc/irssi/irssi-1.2.0-r2.ebuild
+++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild
@@ -22,11 +22,11 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( >=dev-libs/libressl-2.7.4:= )
 	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr )
+		>=net-libs/libotr-4.1.0 )
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 73df7ceb2125..e0ecc363aa78 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -18,12 +18,12 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
 	otr? (
 		>=dev-libs/libgcrypt-1.2.0:0=
 		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr
 	)
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index adc8ad0b81cc..03a668c48c38 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild
index b7980c7cbbbe..b46fffc10c62 100644
--- a/net-libs/c-client/c-client-2007f-r6.ebuild
+++ b/net-libs/c-client/c-client-2007f-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc +ipv6 kerberos kernel_linux kernel_FreeBSD libressl pam ssl static-libs topal chappa"
 
 RDEPEND="
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 3c4a10fa6835..1b1c61e68bb4 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,3 +1,3 @@
 DIST gsoap_2.8.70.zip 32695627 BLAKE2B 6d803441804badf06b29cee8ca898dc864b9a0388f6f3fa58b84c1b237d77e22ab70e0cc5439915c715bdba7831b14f86d8003e1338b6184ddbfe845bb76ff75 SHA512 f7e9f85580c19bb390f1310bb47b690a5788b54c1e12c6fc0d9166039a84ae24ec5d3268cb67cd72b20e2eaa78689e175b975f07da44fd20e172a77ef37f4ae7
-DIST gsoap_2.8.82.zip 32514214 BLAKE2B 4945fc9e8c6fcbf364235c31aaf5eff5546b4f927a69cc973ba9e855a97ba2e40af2823448c2ea7d371aafea3ea6f6a71cc2d0527049fea53a2d6e1bbeecceec SHA512 daf6a1870fe43beb20d0faf646b171c92629885708baabea5bbce79fa5a8030f014dbe5c0bf4024031df993dd3ed3a90449db813946cfdfa9c12318096b57eec
 DIST gsoap_2.8.83.zip 32703770 BLAKE2B 1750a25bcd38c020c83d644395e9b3ac3e0c1080fb82f26b11ea0d0beea98c7dc8f3f24a77e093c6ac7e3598d416430990105eeb93e565809844825e1e937ec1 SHA512 7f4ae6feea26ec2d0e970e77cf476a0049c2e3fe47feba4e3b3b57239e7ae0016c409a74d3e865e56d2c01a8098be282d74a33c686d177d203cb8c2dff6bc407
+DIST gsoap_2.8.84.zip 32538551 BLAKE2B cab2b75ac931ee6063af47975665f45514cb94f5514fb1f76d17ccb2e71d64d4ebd43543cc004ff7f5c49982975ebaa38e555e3bc45dbc370aae991bc7639273 SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79
diff --git a/net-libs/gsoap/gsoap-2.8.82.ebuild b/net-libs/gsoap/gsoap-2.8.84.ebuild
similarity index 100%
rename from net-libs/gsoap/gsoap-2.8.82.ebuild
rename to net-libs/gsoap/gsoap-2.8.84.ebuild
diff --git a/net-libs/libmbim/libmbim-1.16.2.ebuild b/net-libs/libmbim/libmbim-1.16.2.ebuild
index f10f42cfecdd..595dcdc5bfc9 100644
--- a/net-libs/libmbim/libmbim-1.16.2.ebuild
+++ b/net-libs/libmbim/libmbim-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="static-libs udev"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/net-libs/libqmi/libqmi-1.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
index 4d318a2b5e6f..f233d8e52a59 100644
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ b/net-libs/libqmi/libqmi-1.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
 else
-	KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 223c1d028529..18d9ea3ef495 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,12 +2,10 @@ DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b9
 DIST node-v10.15.3.tar.xz 20262632 BLAKE2B d65d4e274fa829be5cda1970b0ebe7081e8476334cb825e5727324c3202bc015f4ba39589608284d0f8c0b722079c06d1587de5299a3c81ccb7b0eacbdaccf84 SHA512 cf741f733af7a7e1fbd37b0f98110078494b4771dbdfccacfda95a5ea4cda6cdcea4f8d31dddcf27477213614e4ab6cf7d1a1f900cb92936333730737ac4f9e8
 DIST node-v11.14.0.tar.xz 22106812 BLAKE2B 3a8dd9feb5916f235bf69d0610e32c1861e64f427b6de5ec27b3634268f273826f271cf5ea821042420d3b3f348124be2ce2fda13d0addea092db1338c9f95f7 SHA512 4e8033ea0f326fe5a8372c81771cd58242881ac7db905f697ce79ef9cb3ba2dfe2b94fb24a36775761c72ac531096c5e18a8574f933d76c1b652b18419b25446
 DIST node-v11.15.0.tar.xz 22115480 BLAKE2B ed1f621e46d24051f8d84255875e7cb2c1bc0f9432a12fcc35dc5e336a71bb3e7f511146d112d1f236f9f978a68987d80331c22699479ce63b7bf30e50643219 SHA512 48270620fab3eef86c21387b316ce9054e2b0aac60a36f7fc08d18ad4a11c8d2082886ca20a455fb4a74a561d7e97c77403227ec9a83a13c47fa230b47a5af2e
-DIST node-v12.1.0.tar.xz 22463256 BLAKE2B ed66ac34acb3e27974f1da192776223104862d00410bc3f77ddafa49fd3e5a1a9921acf472990a8cc953522f2953135ad1af80ac9c83f8d796dce343a086d419 SHA512 bef5b8f85f772fbce474991952cd36cb83f8bfb9cf59d34e0bc4b0b60fb1a5b8547eaaca8c796e865ad6b7e54dc76e0fbb2c0d692ab35c1cb7d3fd4d39add4e5
 DIST node-v12.2.0.tar.xz 22436748 BLAKE2B bb578aad8ad49ee542716086591d896c325083d48b7e69b8b0e9644db2b43546872eaba4b7b6a8b983cb7b21fc948705af88cbf883f275af76bd24918088d584 SHA512 00cda17e5fcce771ea461941d6cdd258545ac295bfbe7543f3153278e73fddbe117dd81c4e22716c147eddaab2577f50abf2a3235b18b4eca60180dee050dd7b
+DIST node-v12.3.0.tar.xz 22448392 BLAKE2B 8c6e40d9bcfee315b6bb5f97846db27ebeae2520fcde5ede942af2f24032101c06653dded9d4fa77992fcdaf5b0f67452e5e3cbb032bd33cde4dc496a652c283 SHA512 4b97524781efb8c284337b36d1b02576aa6703aa37d0775329eff735f38bcb5391364bd420914fa75088b97e72fe087e263a41fb2367fc8e8f7f63ebf4a949e6
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.14.4.tar.xz 15842824 BLAKE2B fc56364be64fe5824e2bb50d861ebf8f58f9895f2c9c108b8df3315b127ffb2755eac85c28165ac9779adab4611ce8f5ea1a5745f43ebaa1389e82b8215c6396 SHA512 1ead0c097ec125230dd631f19a5c3ec06a1371f9ca3b392b5ad08fcc227dd0142f33ad52f96890c2c17448a4951a635b9099dfff00d7d8b3ffb59b07904d1bfa
-DIST node-v6.17.0.tar.xz 15853760 BLAKE2B f1872b2ed43c447beff2b3278e49f9f10bbef58bba2640f6ecd889facfa4c5e5ae142f3b30721faae615df42c0870d7c09147930a259fa81c161b29559e2a340 SHA512 8ae9bfa0336a7d0d9f4a372330de1f877354a3d68bdd6977285787f81999012e42faf4ccef5981fe565ea9e2f18c5490b857bab29359fdf906b5a9fb14628858
 DIST node-v6.17.1.tar.xz 15858444 BLAKE2B ad050f71452f0ddf989e66a4eb02e88e4e5001faa2bcb0eae6b57784da87ba1d8251201e3a3d15245bb4d846f31f39854ddfae47aa1212c0526ec717438ba778 SHA512 6938c4864a96f5698ebc4e9a1228644820789d5402f42348eb1ff9ccd64f31bb91309a1f3301636b1117424c88b0b41b42baae51a1070d5c532604e5d7d7b868
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v8.15.1.tar.xz 18501532 BLAKE2B e6da98902d665997b2e85472424e00f817353dcfc118b1d309f1305099b145eb0eae33429554ab5d563366182b34b24ac78f8b78794f8d21318ebcd137622131 SHA512 23fb4e2580116a69a58514c2dc1f42098c7d594ea9d0cd6e7090f37e12e1805ca6546df66ee68fcb61b803e287ce34422f55129412f6bdcdaa97f515d9581e19
 DIST node-v8.16.0.tar.xz 18515392 BLAKE2B fc2e53322fbd74cc35c3865d718733ca18d37f82af057650cf119ad64bb81aab1dcf8a09e43437b1f196547c11291f5d7de5f53a959f0b742f8f5b97e4a2d7fc SHA512 42ce0aa6f94b42859c2df43db4e3a2818581ccaf92179a7a5252ec122035c8674dddb8aad3b867d8edfff19053918162ad04e8f2eedc1026b199a12b586ae103
diff --git a/net-libs/nodejs/nodejs-12.1.0.ebuild b/net-libs/nodejs/nodejs-12.3.0.ebuild
similarity index 100%
rename from net-libs/nodejs/nodejs-12.1.0.ebuild
rename to net-libs/nodejs/nodejs-12.3.0.ebuild
diff --git a/net-libs/nodejs/nodejs-6.17.0.ebuild b/net-libs/nodejs/nodejs-6.17.0.ebuild
deleted file mode 100644
index 8db127221fd8..000000000000
--- a/net-libs/nodejs/nodejs-6.17.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.9.0:=
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-58.2:= )
-	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-8.15.1.ebuild b/net-libs/nodejs/nodejs-8.15.1.ebuild
deleted file mode 100644
index 059aa2d524ea..000000000000
--- a/net-libs/nodejs/nodejs-8.15.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
-	>=net-dns/c-ares-1.10.1
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.33.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
-)
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/srt/srt-1.3.2.ebuild b/net-libs/srt/srt-1.3.2.ebuild
index bd420bba4fa9..fd800aad8b5d 100644
--- a/net-libs/srt/srt-1.3.2.ebuild
+++ b/net-libs/srt/srt-1.3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 -sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
index 5e332dec8436..4438db5fb696 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection jpeg2k libnotify nsplugin +opengl spell wayland +webgl +X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 99f02ddc4c6b..007510f5b50b 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
index f397135fe098..ab98987d51c9 100644
--- a/net-mail/mailfront/Manifest
+++ b/net-mail/mailfront/Manifest
@@ -1,2 +1,3 @@
 DIST mailfront-0.98.tar.gz 77981 BLAKE2B 1729dc60954fa3337bd7be841050886d091fce4a685e928e61c71e70ff30c473f1dfa7e8d59298ef5790cfe165e91c6827c885c423a74cd9cbe5b0bf4dead233 SHA512 ea0e4352219cedad650787dc38ff11d76484cdaef0a4fbd3e51e68f0c0a7676cd591608658ee4f342dfa7e801c67c8a9bd862243fc9b1e776c8b2fe863faf178
 DIST mailfront-1.16.tar.gz 108212 BLAKE2B 3b3bd3481b572eb48701a2df71a455838430f615332d7de2d4b3c6beea2a0d3b677cf6907bf975c31e7b2fb6cd60aab5ca45a566c515d2b645553a90391d773a SHA512 7f718e9c3b0f0cb4c5fcae967858f2d3597081c9e8e11c5c5e86f147c3e49e338d20acecccfb83d2db4b7e7a5b33f4cc21b0a0c2f71bb6ab8c71c76189281b2b
+DIST mailfront-2.22.tar.gz 128355 BLAKE2B 593598c353aee9c264690de4af5d472bb4b965cb14aa774a0be6fdece200e078a1e2dbe1feca8135e05a54dad2e0fd3378a4a5903f9a45ccffa260fbbbd2edb6 SHA512 30e1c561f8836bbaf893897b1e864539c44600c4b605d4c8c51c1156c9227967a4ac9e2e9eb0b48bb1827001aff2c6a94e9f44c59bf10e16b5d98595c6a9f2f6
diff --git a/net-mail/mailfront/mailfront-2.22.ebuild b/net-mail/mailfront/mailfront-2.22.ebuild
new file mode 100644
index 000000000000..0fae74cd3b54
--- /dev/null
+++ b/net-mail/mailfront/mailfront-2.22.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Mail server network protocol front-ends"
+HOMEPAGE="https://untroubled.org/mailfront/"
+SRC_URI="https://untroubled.org/mailfront/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-2.04
+	>=net-libs/cvm-0.81"
+RDEPEND="${DEPEND}
+	virtual/qmail
+	net-libs/cvm"
+
+src_configure() {
+	echo "${EPREFIX}/var/qmail" > conf-qmail || die
+	echo "/var/qmail/bin" > conf-bin || die
+	echo "/usr/$(get_libdir)/mailfront" > conf-modules || die
+	echo "/usr/include" > conf-include || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} -fPIC -shared" > conf-ccso || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	emake install install_prefix="${ED}"
+	exeinto /var/qmail/supervise/qmail-smtpd
+	newexe "${FILESDIR}"/run-smtpfront run.mailfront
+	exeinto /var/qmail/supervise/qmail-pop3d
+	newexe "${FILESDIR}"/run-pop3front run.mailfront
+
+	dodoc ANNOUNCEMENT ChangeLog NEWS README TODO VERSION
+	docinto html
+	dodoc *.html
+}
+
+pkg_config() {
+	cd "${EROOT}"/var/qmail/supervise/qmail-smtpd/ || die
+	[[ -e run ]] && ( cp run run.qmail-smtpd.`date +%Y%m%d%H%M%S` || die )
+	cp run.mailfront run || die
+
+	cd "${EROOT}"/var/qmail/supervise/qmail-pop3d/ || die
+	[[ -e run ]] && ( cp run run.qmail-pop3d.`date +%Y%m%d%H%M%S` || die )
+	cp run.mailfront run || die
+}
+
+pkg_postinst() {
+	elog "Run"
+	elog "emerge --config '=${CATEGORY}/${PF}'"
+	elog "to update your run files (backups are created) in"
+	elog "		/var/qmail/supervise/qmail-pop3d and"
+	elog "		/var/qmail/supervise/qmail-smtpd"
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d5117b3d95d8..5b0057fe4d1a 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index ca75d1b61d2c..768f3ea1ac34 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,2 +1,4 @@
 DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d4b8d7eea5253a18c6694d720e916b9d3d2a6894db16e5e6a31ddc39bd87ef4e766244047761440f9245c5f563ccd8dd4 SHA512 df2d4ec945f77954b8548513052af4d4f16c904ba450f4560c9185e94c2d4e57dc5ffb865239d1082803e040a60775b78d9c09015932b0fa6159378475d73f10
 DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
+DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
+DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
diff --git a/net-misc/anydesk/anydesk-5.0.0.ebuild b/net-misc/anydesk/anydesk-5.0.0.ebuild
new file mode 100644
index 000000000000..d6ab3121665b
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
+	x86? ( https://download.anydesk.com/linux/${P}-i686.tar.gz )"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glu
+	media-libs/mesa
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc changelog copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+		elog "AnyDesk might require the following commands/packages"
+		elog "for some functions:"
+		elog "* lsb_release	(sys-apps/lsb-release)"
+		elog "* lsusb		(sys-apps/usbutils)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 21498d91e43c..75ce6eb025d1 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1 +1,2 @@
+DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
 DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild
new file mode 100644
index 000000000000..97f303d5634c
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
+HOMEPAGE="
+	https://www.unix-ag.uni-kl.de/~bloch/acng/
+	https://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:*
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	>sys-devel/gcc-4.8
+	virtual/pkgconfig
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-lang/perl
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/debian-changes
+)
+S=${WORKDIR}/${P/_*}
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
+		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
+	fi
+}
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
+	if use fuse; then
+		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
+	else
+		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
+	fi
+	if use tcpd; then
+		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
+	else
+		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${BUILD_DIR} || die
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd-r1 ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc doc/README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+
+		docinto html
+		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin scripts/expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
+
+	keepdir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN}
+}
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 613f07ffcd11..1e7bd719165e 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,5 +1,7 @@
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
 DIST bird-1.6.4.tar.gz 1018874 BLAKE2B f6ef0b952f6b00008fadcaa1c1a32ac31b42a9804e221edb75073e23ff942276bf1beee6d3f4c9d89f90339e99bb82a5953c17ff6963e5ff60d29a50f45e06d4 SHA512 5034d6bdca40ecddaed57bd4ab6e700828b89221bd3ce6d347aa9caa4dca65880c080ee3f276a8c31adde2de16402c8b7e7fd32dc4463d29d63b3f16b833b2eb
 DIST bird-1.6.5.tar.gz 1114984 BLAKE2B 15b2a432e467a8ce81acc4d3d5cf7dea865cf7d3a8c893ab348916fbf60104a5606a6cbc2fcd647c102f3177f0d04d2f046860da244f26a7357f321285f1e295 SHA512 a86c340f4acd9d90b5babe8f19dbd753b2ad94db2c92181bf969244c1d7b20aa825a0311c13a1e19b019019b91af7827775970fd39e807ab32da690492ce356e
+DIST bird-1.6.6.tar.gz 1029505 BLAKE2B 45cd621175962ea22848948e61aaf8b5c4eebbae5f5703bd71571defb2661d0aee646e93a1b42b8d93e6901d256a6e6d91d9bc4573bc01c31d9b359f5184dc5a SHA512 2419e487af2c8e75f613892ee1b1ada00085945bcafe17de972d3196f50a32321a6d18c9a3b58c0c58a5273f348a6d6de8b861505ad559269510a0ba69041fd9
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
+DIST bird-2.0.4.tar.gz 1051911 BLAKE2B 12100685e4aad969dbb51eaa567e1038f50e7c030a25a8697bc35d4f33d0f64f9ccbc045e1210acb78f3d8d4a7cc7ef2be7ae50a36679f2322d292e8e6993ed4 SHA512 65092ca6be115b4d0c31c3c4a79d3ee2e196dc2f85454448eab568cc9cc1fe37b7bdfe1ddb74d4f6f147dc479a8570cf7bf702d762cd69414f976678c14c8e2f
diff --git a/net-misc/bird/bird-1.6.6.ebuild b/net-misc/bird/bird-1.6.6.ebuild
new file mode 100644
index 000000000000..db540658a184
--- /dev/null
+++ b/net-misc/bird/bird-1.6.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug ipv6"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_prepare() {
+	eapply_user
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+
+	if use ipv6; then
+		cd ipv6
+		econf \
+			--enable-ipv6 \
+			--localstatedir="${EPREFIX}/var" \
+			$(use_enable client) \
+			$(use_enable debug)
+	fi
+}
+
+src_compile() {
+	emake
+	if use ipv6; then
+		cd ipv6
+		emake
+	fi
+}
+
+src_install() {
+	if use ipv6; then
+		if use client; then
+			newbin ipv6/birdc birdc6
+		fi
+		newbin ipv6/birdcl birdcl6
+		newsbin ipv6/bird bird6
+		newinitd "${FILESDIR}/initd-${PN}-2" bird6
+	fi
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.4.ebuild b/net-misc/bird/bird-2.0.4.ebuild
new file mode 100644
index 000000000000..152c1ad23c3c
--- /dev/null
+++ b/net-misc/bird/bird-2.0.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
new file mode 100644
index 000000000000..06030d4b3016
--- /dev/null
+++ b/net-misc/bird/files/initd-bird-2
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019 Alarig Le Lay <alarig@grifon.fr>
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+pidfile="/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/${RC_SVCNAME}"
+retry=15
+
+CONF_FILE="/etc/${RC_SVCNAME}.conf"
+SOCK="/run/${RC_SVCNAME}.ctl"
+
+client_args="-s ${SOCK}"
+command_args="${client_args} -c ${CONF_FILE} -P ${pidfile}"
+client_args="${client_args} -r"
+
+depend() {
+	need net
+	use logger
+}
+
+check_run() {
+	BIRD_CHECK_CONF="birdc ${client_args} configure check \"${CONF_FILE}\""
+	# Check if the bird parser returns what we want
+	# We can’t use $? because it’s always 0 if the sock works
+	STATE=$(${BIRD_CHECK_CONF} | grep 'Configuration OK')
+
+	if [ -n "${STATE}" ]; then
+		return 0
+	else
+		# We remove the first three lines (garbage informations), the
+		# errors begin after that
+		eerror "$(${BIRD_CHECK_CONF} | sed '1,3d')"
+		return 1
+	fi
+}
+
+reload() {
+	check_run || return 1
+	ebegin "Reloading BIRD"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		check_run || return 1
+	fi
+}
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index 9fa6267f2b5d..0e5de6b82bcf 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 RDEPEND="
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index ef21be2524de..088b03cec6c1 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,2 +1,3 @@
 DIST istioctl-1.1.4.tar.gz 20705247 BLAKE2B d3727dafcfa8a630a02040fe452a3a2b6c89d4dc2ede4128b9906adf21d97e68f8b126783d248239416a459357bee72ca0f2af19a6d34039ad59b3ade6f3b6d1 SHA512 e866fcad482ef605e4126fffe421eff7fbc1733e5d949e2ebe846f790d8825bb79d5360fe48d29913f0b015c15bc1aac224ac9f39e4e7d5948f2dcd5042570a8
 DIST istioctl-1.1.6.tar.gz 20707819 BLAKE2B 0ebd34873e6ff1fec2413afed8b4fe80baee8e9bec55bc2fab15b25266b404fb05fce6bfd0e122c5eb3fa661f5633a431aaa3042ad6d12caf2c4feb58bdbaa5e SHA512 62b9b96547af6f8050f934e4d620ab1990afc805c0abbdbc7933220d28676542222b4452f8207dbe5976116bfe8ae557ee7545e1859b0ab22d9c0c2510950fca
+DIST istioctl-1.1.7.tar.gz 20711283 BLAKE2B 5c6d54ab033f0dba19377d0ca1a88a57e319932c91d3c2c1f3ad9fc112f11aec481e4421b958490e5b3c24d3be6ae68dbc7122e17a7463585a052e225f77ae5b SHA512 8a00efd3fea05d3b28225bf6d58d46769aa7576851df849185d62a14ef368980df765d3c5b1d9c59dff7f0034259e62fe57bc119b66cecb220513f7b94500cef
diff --git a/net-misc/istioctl/istioctl-1.1.7.ebuild b/net-misc/istioctl/istioctl-1.1.7.ebuild
new file mode 100644
index 000000000000..2d1aca58a468
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="eec7a74473deee98cad0a996f41a32a47dd453c2"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 075a6a33f418..e03f5ec07818 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -4,4 +4,5 @@ DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6
 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8
 DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
+DIST memcached-1.5.15.tar.gz 487808 BLAKE2B cb2bcf9bb0b452b4da4356b2c9f0b9cd2d2e126eac6faefce2929850fec8dc14d58f6782ad3dffecd6869c3229e13b52dbd018543857cf4cc567daaa795b0778 SHA512 945bdb7be0fcc629c72fd7560d08c064e1b560412be1d90e5c4c989db0f77d7ac2d33c6f0ee0830c2dca1825db7394dde8befbe8c87612724c8b524454325a1c
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index 4e9b834c2f91..02450ec7560e 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.15.ebuild b/net-misc/memcached/memcached-1.5.15.ebuild
new file mode 100644
index 000000000000..8d046a22030e
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.15.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 80aac4f17fce..52d42ead5c7b 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 1c8fe9e69d2f..32efa9fb77ed 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,3 +1,4 @@
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
+DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
diff --git a/net-misc/stunnel/files/stunnel-5.54-libressl.patch b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
new file mode 100644
index 000000000000..1965f47bca2d
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
@@ -0,0 +1,313 @@
+diff --git a/src/client.c b/src/client.c
+index 21fa273..e500d62 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -657,7 +657,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated cipher */
+ NOEXPORT void transfer(CLI *c) {
+     int timeout; /* s_poll_wait timeout in seconds */
+     int pending; /* either processed on unprocessed TLS data */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int has_pending=0, prev_has_pending;
+ #endif
+     int watchdog=0; /* a counter to detect an infinite loop */
+@@ -705,7 +705,7 @@ NOEXPORT void transfer(CLI *c) {
+ 
+         /****************************** wait for an event */
+         pending=SSL_pending(c->ssl);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         /* only attempt to process SSL_has_pending() data once */
+         prev_has_pending=has_pending;
+         has_pending=SSL_has_pending(c->ssl);
+@@ -1109,7 +1109,7 @@ NOEXPORT void transfer(CLI *c) {
+             s_log(LOG_ERR,
+                 "please report the problem to Michal.Trojnara@stunnel.org");
+             stunnel_info(LOG_ERR);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+             s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d",
+                 SSL_get_version(c->ssl),
+                 SSL_pending(c->ssl), SSL_has_pending(c->ssl));
+diff --git a/src/ctx.c b/src/ctx.c
+index 01119f3..b73fdcb 100644
+--- a/src/ctx.c
++++ b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+ 
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -130,7 +130,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, char *);
+ 
+ /**************************************** initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -138,7 +138,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+     /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     if(section->option.client)
+         section->ctx=SSL_CTX_new(TLS_client_method());
+     else /* server mode */
+@@ -234,7 +234,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ #endif
+ 
+     /* setup session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
+         decrypt_session_ticket_cb, NULL);
+ #endif /* OpenSSL 1.1.1 or later */
+@@ -493,7 +493,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+@@ -979,7 +979,7 @@ NOEXPORT int ui_retry() {
+ 
+ /**************************************** session tickets */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ typedef struct {
+     void *session_authenticated;
+@@ -1470,7 +1470,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ 
+     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+     if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+         int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index 670adbe..a10cecd 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -96,7 +96,7 @@ NOEXPORT PSK_KEYS *psk_dup(PSK_KEYS *);
+ NOEXPORT void psk_free(PSK_KEYS *);
+ #endif /* !defined(OPENSSL_NO_PSK) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT TICKET_KEY *key_read(char *, char *);
+ NOEXPORT TICKET_KEY *key_dup(TICKET_KEY *);
+ NOEXPORT void key_free(TICKET_KEY *);
+@@ -3104,7 +3104,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+         break;
+     }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* sslVersion */
+     switch(cmd) {
+@@ -3273,7 +3273,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+     }
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* ticketKeySecret */
+     switch(cmd) {
+@@ -3755,7 +3755,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
+ 
+ /**************************************** modern TLS version handling */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int str_to_proto_version(const char *name) {
+     if(!strcasecmp(name, "all"))
+@@ -4079,7 +4079,7 @@ NOEXPORT void psk_free(PSK_KEYS *head) {
+ 
+ /**************************************** read ticket key */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L
++#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT TICKET_KEY *key_read(char *arg, char *option) {
+     char *key_str;
+diff --git a/src/prototypes.h b/src/prototypes.h
+index ebd413c..edd4341 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -244,7 +244,7 @@ typedef struct service_options_struct {
+ #if OPENSSL_VERSION_NUMBER>=0x009080dfL
+     long unsigned ssl_options_clear;
+ #endif /* OpenSSL 0.9.8m or later */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int min_proto_version, max_proto_version;
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+     SSL_METHOD *client_method, *server_method;
+@@ -706,7 +706,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
+ extern CLI *thread_head;
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -755,7 +755,7 @@ typedef enum {
+ 
+ extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
+ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
+ int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
+diff --git a/src/ssl.c b/src/ssl.c
+index 60e31c1..10b0658 100644
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -39,7 +39,7 @@
+ #include "prototypes.h"
+ 
+     /* global OpenSSL initialization: compression, engine, entropy */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+     void *from_d, int idx, long argl, void *argp);
+ #else
+@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+ #endif
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+         void *from_d, int idx, long argl, void *argp) {
+ #else
+@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
+ 
+ #ifndef OPENSSL_NO_COMP
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
+     return meth->type;
+diff --git a/src/sthreads.c b/src/sthreads.c
+index dc2cd43..7a01f2e 100644
+--- a/src/sthreads.c
++++ b/src/sthreads.c
+@@ -102,14 +102,16 @@ unsigned long stunnel_thread_id(void) {
+ 
+ #endif /* USE_WIN32 */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
+     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
+ }
+ #endif
+ 
+ void thread_id_init(void) {
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_THREADID_set_callback(threadid_func);
+ #endif
+ #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
+@@ -120,7 +122,7 @@ void thread_id_init(void) {
+ /**************************************** locking */
+ 
+ /* we only need to initialize locking with OpenSSL older than 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_PTHREAD
+ 
+@@ -229,7 +231,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
+ 
+ CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -339,7 +341,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
+ 
+ void locking_init(void) {
+     size_t i;
+-#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
++#if defined(USE_OS_THREADS) && \
++    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
+     size_t num;
+ 
+     /* initialize the OpenSSL static locking */
+diff --git a/src/tls.c b/src/tls.c
+index 6c92b96..5e60a95 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -41,7 +41,7 @@
+ volatile int tls_initialized=0;
+ 
+ NOEXPORT void tls_platform_init();
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *);
+ #endif
+ 
+@@ -52,7 +52,7 @@ void tls_init() {
+     tls_platform_init();
+     tls_initialized=1;
+     ui_tls=tls_alloc(NULL, NULL, "ui");
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_set_mem_functions(str_alloc_detached_debug,
+         str_realloc_detached_debug, str_free_debug);
+ #else
+@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
+ 
+ /**************************************** OpenSSL allocator hook */
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *ptr) {
+     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
+     /* unfortunately, OpenSSL provides no file:line information here */
+diff --git a/src/verify.c b/src/verify.c
+index 1d1eccb..dfd9bff 100644
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
+     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     subject=X509_get_subject_name(cert);
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100006L
++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
+     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.54.ebuild b/net-misc/stunnel/stunnel-5.54.ebuild
new file mode 100644
index 000000000000..a36f2872e781
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.54.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit ssl-cert multilib systemd user
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="http://www.stunnel.org/index.html"
+SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
+
+DEPEND="!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="${DEPEND}
+	stunnel3? ( dev-lang/perl )
+	selinux? ( sec-policy/selinux-stunnel )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup stunnel
+	enewuser stunnel -1 -1 -1 stunnel
+}
+
+src_prepare() {
+	# Hack away generation of certificate
+	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+		tools/Makefile.in || die "sed failed"
+
+	# bugs 656420, 682894
+	eapply "${FILESDIR}"/${P}-libressl.patch
+
+	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable ipv6) \
+		$(use_enable tcpd libwrap) \
+		--with-ssl="${EPREFIX}"/usr \
+		--disable-fips
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${ED}"/usr/share/doc/${PN}
+	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+	# The binary was moved to /usr/bin with 4.21,
+	# symlink for backwards compatibility
+	dosym ../bin/stunnel /usr/sbin/stunnel
+
+	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	docinto html
+	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+		tools/importCA.html
+
+	insinto /etc/stunnel
+	doins "${FILESDIR}"/stunnel.conf
+	newinitd "${FILESDIR}"/stunnel-r1 stunnel
+
+	doenvd "${T}"/20stunnel
+
+	systemd_dounit "${S}/tools/stunnel.service"
+	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+		install_cert /etc/stunnel/stunnel
+		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+	fi
+
+	einfo "If you want to run multiple instances of stunnel, create a new config"
+	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
+	einfo "\'pid= \' with a unique filename."
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 670c0d65feda..615792619c02 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1 +1,2 @@
 DIST youtube-dl-2019.05.11.tar.gz 3167002 BLAKE2B aad84dcb9f729bd3c6622978c2f9d2d1d9b20c6a7bc59a9d134cff4a857abcb6e5360f058399f5385a5f088f0a695077786a56b94f68fce4e4518bf090b762a1 SHA512 e47a2163d73554fc125a2ac9c14cb12eadd506f6416fd673d687e9a068ece34e95d7f59483aefaa329da0a8c4b72e6d1debc2a8d3bd6c7ded5fbe543c5d769b9
+DIST youtube-dl-2019.05.20.tar.gz 3167834 BLAKE2B fe5501380b5134665b3c5c31a7b703832d7c7d9675c1e7c20bfa2b4ebc175e37521b423b68d3701a3637e047e3d4f12e54786f7d6f23e896f0a9da93c39be6f5 SHA512 c50661585f987a6c2abc7b9940749a2ba8e9a534d66f0846dddb265be3fe5a58ba8009fbad44c2551c7574b73bc21aa35f7d633729c0090c46e5818199dccb1d
diff --git a/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild b/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild
new file mode 100644
index 000000000000..a8b1afbfc11a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.05.20.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9017393d1f77..f84e4b6dcad1 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 613016ee8be3..838597c56439 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,3 +1,2 @@
-DIST airdcpp-webclient-2.5.0.tar.gz 900078 BLAKE2B 53f5e096a3a6cc7c77c92bef32a7aaf0fb7b5e49740718252c7b4e233b80c52ca27029ba24fef4f1ab9c4c360da182accffb8ba7de27ef9b0b4aaa011005b689 SHA512 cf0220e3f2096304e393a4bd833e81c1427dbd144a56498712c9e18f2ec14f35d9112ad0ff05f54aad5a57126d68fc46c2bf20806dd7464a5bdb301543b08809
-DIST airdcpp-webclient-2.5.1.tar.gz 898980 BLAKE2B a930a13d34068977d0184ea56163cb9ae0f47bd92cfb724145f287742fb034ebc89f0a55fc5b07a8761de0749d3725912d4f4682542ac60c93b003a08ed24c9f SHA512 297aa780ecc35f48000eba1cc3b6f284a64954fbcc257ed58c84f2c88901b1c01c17228883c6569fa1333f0e41067f9fe7623ef24e458844544f6d6cc2b45c4c
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
+DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
deleted file mode 100644
index 8d45254e2be0..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils python-any-r1 user
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="nat-pmp +tbb +webui"
-
-RDEPEND="
-	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:= )
-"
-DEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	${RDEPEND}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	enewgroup airdcppd
-	enewuser airdcppd -1 -1 /var/lib/airdcppd airdcppd
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_WEB_UI=OFF
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	keepdir /var/lib/airdcppd
-	fowners airdcppd:airdcppd /var/lib/airdcppd
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
similarity index 100%
rename from net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
rename to net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 909943814532..378cab54ef84 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,2 +1,3 @@
 DIST cpuminer-opt-3.8.8.1.tar.gz 1709515 BLAKE2B cecf9f57093fd89cef459cdc0d591a5de4bb12126a931dd9bfee0fc9b08a7ec4b5bb087ad383f14492b3da3066bac695f0022e1dfc595c7e331c9517b4b44db6 SHA512 5dd254237231abb84312c31be97952d1e1f1cd6c4fa0efc409581afb1a28d9783816b9efdb07501d67b99b831bce0a290e5cc2b3ce6c915a3e76b00edd582560
+DIST cpuminer-opt-3.9.0.1.tar.gz 1744675 BLAKE2B e1dff3bafd1c60bd67dbeca6acad4ee48a00bf0d77512686ac5b2bd9f375eee4a6e9b32c891f195bb98c4a48ac0f52a6da91bc51e28017dd811bf975d8c0550f SHA512 f807f9f7416983363116a07b12a191227907e26a658f6cd00f5556292785c27f6b56df9998a06bc1e44769bd549a5be75acd6986d446dd885b8b49763fde1731
 DIST cpuminer-opt-3.9.0.tar.gz 1744113 BLAKE2B 0fef9ead2218284032d70df4d823f43896a72a06c91612b3a9981a89bb51c890d3fe54707af80d2ebe3ceb513ef98c3e7b036b9ec0a9767ff5b969bed2a26318 SHA512 beb3faf8f2b765f7f995274e247b59590c3cebf2f6d46ce39abac8ecec322cabfc4b2acc087686f9c701c2c32d96b5d1f95d34413ec70c727b58f67054fc2603
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
new file mode 100644
index 000000000000..666d27ee1c02
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 87386785137e..37413fd37323 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 3a8dc89ba1f7..ff909b43f581 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1 +1,2 @@
 DIST libreswan-3.27.tar.gz 3720103 BLAKE2B 51ee792cd3fb8330a9cfee0b1a27e48c9a8c8fd3346e8c06fe0a911c813c400ef62d68b1d06bb849695aad5f4d5a496dc444b2543aa9ffbc59d373081c0b85e5 SHA512 b92ecfd08b9d19dc801032176eff3dd07f625223d4f0dd07ff10f639644573430a55f7aebfcc8b9d2424e194ca9d06b17ad5a13dad5dc6f659d19bc5d32520f5
+DIST libreswan-3.28.tar.gz 3842828 BLAKE2B 7e78f3c6d1d6a22a64f1316bb63366823ce763a3eb236e2cd64dc7f3fa9a84caff7a31cb65a6583521280e5ee84ac220c1770d230ba0b7098a1582613751c456 SHA512 aeb3ea723f2ca10098f2626172166cddea59b3bc084f0fefc823fd784d8986b12adc5a5b0965f2c7ecdfff5ac8029a922b8357debf79ff43605783d80e144983
diff --git a/net-vpn/libreswan/libreswan-3.28.ebuild b/net-vpn/libreswan/libreswan-3.28.ebuild
new file mode 100644
index 000000000000..184f45188246
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.28.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+
+DEPEND="
+	dev-libs/gmp:0=
+	dev-libs/libevent:0=
+	dev-libs/nspr
+	caps? ( sys-libs/libcap-ng )
+	curl? ( net-misc/curl )
+	dnssec? ( net-dns/unbound:= net-libs/ldns )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-libs/nss
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+	dev-libs/nss[utils(+)]
+	sys-apps/iproute2
+	!net-misc/openswan
+	!net-vpn/strongswan
+	selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+	usex "$1" true false
+}
+
+src_prepare() {
+	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export AR CC
+	export INC_USRLOCAL=/usr
+	export INC_MANDIR=share/man
+	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+	export FINALDOCDIR=/usr/share/doc/${PF}/html
+	export INITSYSTEM=openrc
+	export INC_RCDIRS=
+	export INC_RCDEFAULT=/etc/init.d
+	export USERCOMPILE=
+	export USERLINK=
+	export USE_DNSSEC=$(usetf dnssec)
+	export USE_LABELED_IPSEC=$(usetf selinux)
+	export USE_LIBCAP_NG=$(usetf caps)
+	export USE_LIBCURL=$(usetf curl)
+	export USE_LINUX_AUDIT=$(usetf selinux)
+	export USE_LDAP=$(usetf ldap)
+	export USE_SECCOMP=$(usetf seccomp)
+	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+	export SD_WATCHDOGSEC=$(usex systemd 200 0)
+	export USE_XAUTHPAM=$(usetf pam)
+	export DEBUG_CFLAGS=
+	export OPTIMIZE_CFLAGS=
+	export WERROR_CFLAGS=
+}
+
+src_compile() {
+	emake all
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+	: # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+	default
+	emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+	fperms 0600 /etc/ipsec.secrets
+
+	dodoc -r docs
+
+	find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
+	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+		eend $?
+		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c2c5196287d4..a44bfb69d953 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index 7c3d9a892854..09e5e6b6a669 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
index ed88e2a8e475..7d625774f0d5 100644
--- a/net-wireless/crda/crda-3.18-r3.ebuild
+++ b/net-wireless/crda/crda-3.18-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="gcrypt libressl"
 
 RDEPEND="!gcrypt? (
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
index cb32ad203bb9..01063ffe168f 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ else
 	#cd rtl-sdr
 	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 886664e66b30..cb39ce25f1ce 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,6 @@
 DIST unifi-5.10.21.zip 91783841 BLAKE2B 92d4c886fe10e65a3517ab8ee21ca999751e8ac35d8d7a9c1355a586f2ac31ccd12b4337673308a620866757fa4e4d34a559ed1ec23f04bfe07eb2a16f1018d3 SHA512 239493242d73347639eb99bcb3d01f852cddebd33efd5687759e6520f6f36e7c152588321d0464f63f3369927e48070d62dcb5cfaee74fb16cbceda8725b0a9a
 DIST unifi-5.10.23.zip 91775246 BLAKE2B 842ffd4c63b19d480fa29330fa66245cbfdd840f719d5c9e1bd59972f7dba6d2a425c22097a3afa01aab719bdad162dced938e1406716a7892a6a30e58797f61 SHA512 be4a4f855b741dcd86f46a082838a770c1b622f8f1e860f1005e8fbf55306a28de98a3ba2a704af21e6badd7d342465520c42e481b2bec50ec4439d8f784edc3
+DIST unifi-5.10.24.zip 91779832 BLAKE2B 2e20b10036d185b2fa282b0bf3f1b7538482a5ed07c334f1d681957abc7e63a6de97709c2c35fb4b1e2186351b3fd47460d6c21be5483301b0ff008ade97bb63 SHA512 db71422339ab93cd285ae62715c4066075d6602f16767e765461e1121d75f44c348f10ddd0033626b35e199df4da7b6e26efe350e8052eab0ee98471939d44b6
 DIST unifi-5.11.18.zip 99865634 BLAKE2B 41403e420441793685cb27347238e5e8243083fef2386401be05705571921d0d0317c2b786080b8b2181dda76324cc0592f03729460c732d5b454d22f6682e49 SHA512 33c332a3719c8500fc918d93a40dddb1465e108b13faa969e311a47ed5781842297700293cefad6a13feb2ae267a11b929c103352e055a78d392c8b8c1bbac16
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
diff --git a/net-wireless/unifi/unifi-5.10.24.ebuild b/net-wireless/unifi/unifi-5.10.24.ebuild
new file mode 100644
index 000000000000..f05b3f52c3bc
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.10.24.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Used when it's an unstable, beta or release candidate
+RC_SUFFIX="-fc15f0fdf1"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.10"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 20ddc269590d..471371d90d98 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 9a134f645267..8bae7dd1d1cf 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
 # Depends on unstable media-libs/dav1d
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Mikle Kolyada <zlogene@gentoo.org> (15 Sep 2018)
 # the dependency is unstable
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 747e71d461bd..9e4d8a253d08 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -57,7 +57,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-13 frei0r
-<=media-video/ffmpeg-3.4.5 frei0r sofalizer
+<=media-video/ffmpeg-4.1.3 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
 # No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 2cc75a593f81..f5f8a290b1b3 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Aaron Bauman <bman@gentoo.org> (20 May 2019)
-# media-libs/gstreamer fails tests
-x11-libs/wxGTK gstreamer
-
 # Aaron Bauman <bman@gentoo.org> (20 May 2019)
 # doc USE ultimately pulls in dev-lang/ocaml[ocamlopt]
 media-gfx/enblend doc
@@ -494,10 +490,6 @@ dev-util/dbus-test-runner test
 # remove mask when >=app-editors/gedit-3.6 is keyworded here
 dev-util/devhelp gedit
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when app-crypt/libsecret is keyworded here
->=gnome-base/gvfs-1.14 gnome-keyring
-
 # Markus Meier <maekke@gentoo.org> (25 Dez 2012)
 # unkeyworded deps for app-accessibility/speech-dispatcher
 app-accessibility/speech-dispatcher flite
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index e3bd2b590b4a..2e1a9ab86a31 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -41,10 +41,6 @@ python_single_target_python3_7
 # Not stable yet.
 vala
 
-# Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
-# app-crypt/libsecret and co not marked stable yet
-gnome-keyring
-
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # virtual/{jdk,jre} are not stable here.
 java
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 0e97607f49ae..90c52e0b84f0 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (21 May 2019)
+# No ia64 arch support for jit. Version 17 USE=debug
+# required USE=jit.
+dev-lang/spidermonkey jit
+=dev-lang/spidermonkey-17* debug
+
 # Mart Raudsepp <leio@gentoo.org> (17 Mar 2019)
 # Unkeyworded media-libs/opencv dependency, bug #680656
 media-gfx/shotwell opencv
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index 8c6534c6999a..fd46d5c16886 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -3,7 +3,7 @@
 
 # RISC-V rv64gc/lp64 no-multilib profile
 
-CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64"
+CFLAGS="-O2 -pipe -march=rv64imac -mabi=lp64"
 CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index b943c309a4ef..00a1efed92fd 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans <grknight@gentoo.org> (22 May 2019)
+# Allow python-exec to install all targets
+# Ack by mgorny
+dev-lang/python-exec -python_targets_python3_7
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 May 2019)
+# dev-db/oracle-instantclient ain't stable
+dev-qt/qtsql oci8
+
 # Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
 # media-libs/dav1d is not yet stable
 media-video/vlc dav1d
@@ -36,6 +45,8 @@ app-admin/sudo -sssd
 # Mart Raudsepp <leio@gentoo.org> (01 Nov 2018)
 # net-wireless/iwd not stable yet
 net-misc/networkmanager iwd
+# Ben Kohler <bkohler@gentoo.org> (22 May 2019)
+net-misc/connman iwd
 
 # Thomas Deutschmann <whissi@gentoo.org> (27 Sep 2018)
 # sys-devel/lld is unstable
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 03f8e8c920bd..bd7f8963dc12 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# James Le Cuirot <chewi@gentoo.org> (21 May 2019)
+# Doesn't support ffmpeg-4. Portage takes a long time to report the
+# conflict and the feature is half broken anyway. See
+# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179.
+games-emulation/vbam ffmpeg
+
 # Ulrich Müller <ulm@gentoo.org> (18 May 2019)
 # Firmware images without a known license. Most likely, upstream
 # redistribution may conflict with the licenses or lack thereof
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0879dc3bdde3..8bde36761be2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Bernd Waibel <waebbl@gmail.com> (22 May 2019)
+# Marked experimental, needs build and runtime testing. Due to non-
+# available licenses for arnold and maya I can not test these addons.
+# Build and functional tests and reports on issues are appreciated!
+media-gfx/alembic arnold maya
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
 # needs llvm slots which are not stable #678908
 # also prone to weird compilation failures
diff --git a/profiles/desc/enlightenment_modules.desc b/profiles/desc/enlightenment_modules.desc
deleted file mode 100644
index 9ed9d46414c4..000000000000
--- a/profiles/desc/enlightenment_modules.desc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ENLIGHTENMENT_MODULES USE_EXPAND
-# for x11-wm/enlightenment.
-
-appmenu - Gadget that holds the menubar of the foreground application
-backlight - Backlight control slider gadget
-battery - A gadget to visualize your battery status
-bluez4 - Configure Bluetooth devices
-clock - Nice clock gadget to show current time
-cpufreq - Gadget to monitor and change the CPU frequency
-everything - The run command module provides an application launcher dialog
-fileman - Enlightenment's integrated file manager
-fileman-opinfo - Allows EFM to be placen on the desktop or in a shelf
-gadman - Module to manage gadgets on the desktop
-geolocation - Geolocation information
-ibar - Iconic application launcher
-ibox - A home for your iconified applications
-lokker - Screen locker
-luncher - Iconic application launcher
-mixer - A module to provide a mixer for changing volume
-msgbus - DBus Extension
-music-control - Control your music in your shelf
-notification - Notification-daemon alternative
-packagekit - Package manager integration
-pager - Gadget to allow you to visualize your virtual desktops and the windows they contain
-pager-plain - A simpler desktop pager
-quickaccess - Enlightenment Quickaccess Launcher
-shot - Simple screenshot+save/upload module
-start - Enlightenment's 'Start' button equivalent
-syscon - Provides a unified popup dialog for all the system actions in Enlightenment
-sysinfo - A gadget to visualize your system info
-systray - System tray that hold applications icons like Skype, Pidgin, Kopete and others
-tasks - Gadget to allow you to switch tasks
-teamwork - Enable teamwork module
-temperature - Temperature monitor
-time - Time related gadgets
-tiling - Positions/resizes your windows tilingly
-vkbd - Virtual keyboard
-winlist - A module to show the list of client applications presently running
-wizard - First Run Wizard
-wireless - WiFi monitoring
-wl-buffer - Wayland buffer
-wl-desktop-shell - Enlightenment Wayland Desktop Shell
-wl-drm - Wayland DRM (Direct Rendering Manager) compositing module
-wl-text-input - Wayland text input support
-wl-weekeyboard - Wayland virtual keyboard
-wl-wl - Wayland-in-Wayland module
-wl-x11 - Wayland-in-X11 module
-xkbswitch - Keyboard layout configuration and switcher
-xwayland - X/Wayland integration
-conf - Settings Panel
-conf-applications - Allows configuration of Ibar, Restart, and Startup applications
-conf-bindings - Input Control Settings
-conf-dialogs - Configure default dialog properties
-conf-display - Used to configure your screen
-conf-interaction - Configure Mouse and Touch input
-conf-intl - Used to select a default language
-conf-menus - Configures menu behavior
-conf-paths - Specifies the Enlightenment search paths and default directories
-conf-performance - Used to configure certain performance related items as frame rates and cache settings
-conf-randr - Used to configure your screen's resolution
-conf-shelves - Shelf configuration dialog
-conf-theme - Used to configure your theme preferences
-conf-window-manipulation - Configures window raise, resistance, and maximize policies
-conf-window-remembers - Delete existing window remembers
diff --git a/profiles/package.mask b/profiles/package.mask
index 450f394b454c..b91816e79561 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,19 @@
 
 #--- END OF EXAMPLES ---
 
+# Lars Wendler <polynomial-c@gentoo.org> (21 May 2019)
+# Masked for testing
+=sys-libs/ncurses-6.1_p20181020
+
+# Stefan Strogin <steils@gentoo.org> (21 May 2019)
+# Unmaintained. Last release in 2005. Does not build with
+# >=dev-libs/bglibs-2.04. Bug #686438.
+net-mail/qmail-qfilter
+
+# Stefan Strogin <steils@gentoo.org> (21 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #347479.
+>=net-mail/mailfront-2.22
+
 # Michał Górny <mgorny@gentoo.org> (19 May 2019)
 # Unmaintained.  The program breaks init.d script (#626580).  Homepage
 # and public sources disappeared.  Last release in 2006.
@@ -114,6 +127,7 @@ dev-python/detox
 ~virtual/perl-Math-BigInt-FastCalc-0.500.800
 ~virtual/perl-Math-BigRat-0.261.400
 ~virtual/perl-Module-CoreList-5.201.905.200
+~virtual/perl-Module-CoreList-5.201.905.220
 ~virtual/perl-Module-Load-0.340.0
 ~virtual/perl-Module-Metadata-1.0.36
 ~virtual/perl-Net-Ping-2.710.0
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 4ca2d473d009..8d8dd0a834cc 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (30 Apr 2019)
-# Fails to compile, bug #684024
-=dev-lang/perl-5.28.2*
-
 # Fabian Groffen <grobian@gentoo.org> (22 Mar 2019)
 # fails to compile, bug #681316
 =app-crypt/gnupg-2.2.14
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 019ef2e56ef5..1465ef6062f6 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -256,6 +256,7 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	exp
 # @MAINTAINER: riscv@gentoo.org
 riscv		default/linux/riscv/17.0/rv64gc			stable
 riscv		default/linux/riscv/17.0/rv64gc/lp64d		dev
+riscv		default/linux/riscv/17.0/rv64gc/lp64		exp
 
 # S390 Profiles
 # @MAINTAINER: s390@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 90a350633f2f..3a19b31bc7b1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2354,11 +2354,9 @@ dev-libs/efl:harfbuzz - Enable complex text shaping and layout support
 dev-libs/efl:hyphen - Enable text hyphenation support
 dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
-dev-libs/efl:ivi - Enable ivi-shell support
 dev-libs/efl:libuv - Enable dev-libs/libuv support
 dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
 dev-libs/efl:physics - Enable Bullet physics effects and support
-dev-libs/efl:pixman - Enable PixMan for software rendering
 dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
@@ -4043,6 +4041,7 @@ mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
+mail-client/trojita:addressbook - Build kde-apps/akonadi addressbook plugin
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
 mail-filter/MailScanner:postfix - Set mail-mta/postfix to used MTA
@@ -8068,6 +8067,7 @@ sys-apps/systemd:vanilla - Disable Gentoo-specific behavior and compatibility qu
 sys-apps/systemd:xkb - Depend on x11-libs/libxkbcommon to allow logind to control the X11 keymap
 sys-apps/tcp-wrappers:netgroups - Support matching NIS (host) netgroup names via the @netgroup syntax (if you don't know what this means, you most likely do not need it)
 sys-apps/timer_entropyd:debug - Enable printf debugging and logging to the syslog at DEBUG level
+sys-apps/ucspi-ssl:bindist - Disable EC/RC5 algorithms in OpenSSL for patent reasons.
 sys-apps/usb_modeswitch:jimtcl - Use dev-lang/jimtcl instead of dev-lang/tcl for smaller memory footprint
 sys-apps/usermode-utilities:fuse - Build tools (currently umlmount) needing fuse
 sys-apps/util-linux:caps - build setpriv helper (run programs with diff capabilities)
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index aa30959818fa..c33b3a215de1 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/amd/amd-2.3.1.ebuild b/sci-libs/amd/amd-2.3.1.ebuild
index 0a269ccff930..9cfa1f72fcdd 100644
--- a/sci-libs/amd/amd-2.3.1.ebuild
+++ b/sci-libs/amd/amd-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc fortran static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/camd/camd-2.3.1.ebuild b/sci-libs/camd/camd-2.3.1.ebuild
index acd75e0feb53..3a895fbdcc07 100644
--- a/sci-libs/camd/camd-2.3.1.ebuild
+++ b/sci-libs/camd/camd-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
index a631cbdf4641..936f8d8597f4 100644
--- a/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
+++ b/sci-libs/ccolamd/ccolamd-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/cholmod/cholmod-2.1.2.ebuild b/sci-libs/cholmod/cholmod-2.1.2.ebuild
index 2f32156ec941..36dc9631c3b1 100644
--- a/sci-libs/cholmod/cholmod-2.1.2.ebuild
+++ b/sci-libs/cholmod/cholmod-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="minimal? ( LGPL-2.1 ) !minimal? ( GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cuda doc lapack metis minimal static-libs"
 
 RDEPEND="
diff --git a/sci-libs/colamd/colamd-2.8.0.ebuild b/sci-libs/colamd/colamd-2.8.0.ebuild
index 6bafb95e19d9..8db300ccfa2d 100644
--- a/sci-libs/colamd/colamd-2.8.0.ebuild
+++ b/sci-libs/colamd/colamd-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND="sci-libs/suitesparseconfig"
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index 0060a1d2ac2a..a48ad0321e3e 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P
 
 LICENSE="NCSA-HDF"
 SLOT="0/${PV%%_p*}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib"
 
 REQUIRED_USE="
diff --git a/sci-libs/metis/metis-4.0.3.ebuild b/sci-libs/metis/metis-4.0.3.ebuild
index 73b9671feace..444328b56d9e 100644
--- a/sci-libs/metis/metis-4.0.3.ebuild
+++ b/sci-libs/metis/metis-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/metis/"
 SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/OLD/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 LICENSE="free-noncomm"
 IUSE="doc static-libs"
 
diff --git a/sci-libs/parmetis/parmetis-4.0.3.ebuild b/sci-libs/parmetis/parmetis-4.0.3.ebuild
index 5fbc940345ef..0351c921efe4 100644
--- a/sci-libs/parmetis/parmetis-4.0.3.ebuild
+++ b/sci-libs/parmetis/parmetis-4.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	examples? ( http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/${METISP}.tar.gz )"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 LICENSE="free-noncomm"
 IUSE="doc double-precision examples int64 mpi openmp pcre static-libs"
 
diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
index 04632e4581ef..da76bae6e389 100644
--- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
+++ b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 
 multilib_src_configure() {
diff --git a/sci-libs/umfpack/umfpack-5.6.2.ebuild b/sci-libs/umfpack/umfpack-5.6.2.ebuild
index a554bfb1cddb..a364af07817f 100644
--- a/sci-libs/umfpack/umfpack-5.6.2.ebuild
+++ b/sci-libs/umfpack/umfpack-5.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +cholmod static-libs"
 
 RDEPEND="
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c802113c44d4..fa71eee80cc0 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/lsd/lsd-0.14.0.ebuild b/sys-apps/lsd/lsd-0.14.0.ebuild
index 780361d67877..b7706acf02f5 100644
--- a/sys-apps/lsd/lsd-0.14.0.ebuild
+++ b/sys-apps/lsd/lsd-0.14.0.ebuild
@@ -49,7 +49,7 @@ SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
index 33bb53925e12..7c2dbd8ad9fd 100644
--- a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
@@ -96,7 +96,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+man pcre"
 
 DEPEND=""
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 016aa746d920..5269429dd6b4 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -2,3 +2,4 @@ DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b47194
 DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
+DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index 37052d6e36cd..32a4fcc2cbce 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -17,4 +17,7 @@
 		building SSL client-server applications. They conform to the UNIX
 		Client-Server Program Interface, UCSPI.
 	</longdescription>
+	<use>
+		<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
new file mode 100644
index 000000000000..7325e21a7b02
--- /dev/null
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails qmail
+
+DESCRIPTION="Command-line tools for building SSL client-server applications"
+HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
+SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bindist perl libressl"
+
+DEPEND="libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp"
+
+S="${WORKDIR}"/host/superscript.com/net/${P}
+
+src_prepare() {
+	ht_fix_all
+
+	sed -i -e 's:auto:gcc:' conf-cc || die
+	sed -i -e 's:-m64::' conf-ld || die
+	qmail_set_cc
+
+	echo "/usr/bin" > conf-tcpbin || die
+	echo "/usr/share/ca-certificates/" > conf-cadir || die
+	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
+	echo "/usr/" > src/home || die
+	sed -i -e 's:HOME/command:/usr/bin:' \
+		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
+
+	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
+	sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
+	if use bindist; then
+		echo > conf-ecdh || die
+	fi
+
+	eapply_user
+}
+
+src_compile() {
+	cd src || die
+	emake sysdeps
+	emake uint32.h
+	emake
+}
+
+src_install() {
+	dodoc -r doc/.
+	doman man/*
+
+	cd src || die
+	dobin $(<../package/commands-base)
+	use perl && dobin $(<../package/commands-sslperl)
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 62c974905ff1..e01c07cb9a39 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 1b3ff85a28d9..53cd28195cd4 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,3 +1 @@
-DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
-DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
diff --git a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch b/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
deleted file mode 100644
index 128ac8ce311b..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.6.0-fix-udev-rules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove spurious \n to fix udev rule generation
-
-Steven Newbury <steve@snewbury.org.uk>:
-libfprint generates 60-fprint-autosuspend.rules for all supported devices, 
-however there's a spurious \n before the ', MODE="0666"' which results in it 
-appearing on a new line after the match criteria.  At least on current 
-systemd/udev this results in MODE="0666" being applied unconditionally to all 
-device nodes.  This is an extremely serious security problem and effectively 
-gives root access to all users simply by having the ebuild emerged.
-
-https://bugs.gentoo.org/562218
-
---- a/libfprint/fprint-list-udev-rules.c
-+++ b/libfprint/fprint-list-udev-rules.c
-@@ -74,7 +74,7 @@
- 	if (num_printed == 0)
- 	    printf ("# %s\n", driver->full_name);
- 
--	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n, MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
-+	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\", MODE=\"0666\"\n", driver->id_table[i].vendor, driver->id_table[i].product);
- 	printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name);
- 	num_printed++;
-     }
diff --git a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
deleted file mode 100644
index 73bc12900ff3..000000000000
--- a/sys-auth/libfprint/libfprint-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="V_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~xmw/${P}_vfs0050.patch.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs vanilla"
-
-RDEPEND="virtual/libusb:1
-	dev-libs/glib:2
-	dev-libs/nss
-	x11-libs/pixman"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-udev-rules.patch"
-)
-
-src_prepare() {
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/${P}_vfs0050.patch
-	fi
-
-	default
-
-	# upeke2 and fdu2000 were missing from all_drivers.
-	sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-drivers=all \
-		$(use_enable debug debug-log) \
-		$(use_enable static-libs static) \
-		-enable-udev-rules \
-		--with-udev-rules-dir=$(get_udevdir)/rules.d
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.99.0.ebuild b/sys-auth/libfprint/libfprint-0.99.0.ebuild
index f47dc6065968..f985a5c73d6b 100644
--- a/sys-auth/libfprint/libfprint-0.99.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.99.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').ta
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-auth/pam_ssh_agent_auth/Manifest b/sys-auth/pam_ssh_agent_auth/Manifest
index 1b1fdc46d1ce..1c43b8634e49 100644
--- a/sys-auth/pam_ssh_agent_auth/Manifest
+++ b/sys-auth/pam_ssh_agent_auth/Manifest
@@ -1,5 +1 @@
-DIST pam_ssh_agent_auth-0.10.2.tar.bz2 246412 BLAKE2B 3adf2bcc76559733f997744c95c660c67010b124db6e811559625a2ad7cbc7339d43d22dd5144135ae36ab90fdeb3c80c887e3157241936ceeb6026c8aa298fe SHA512 b4b9bc4486d873f236f7c54874c996e24f344f889dfda3beadb12b97cbb89078028a103a4a7175cd919fb0a12fd5bcefef50420510ae5eff9252e494e0124b38
 DIST pam_ssh_agent_auth-0.10.3.tar.bz2 1066393 BLAKE2B 07b113d05e09f770d63dbea813ea644199d2b103f9c6d7e5960bfad37cb181ce5a5f111f72e0274c0335e4c217ccd19bd53d61af23f8bc6aff14c1995fc4edc9 SHA512 d75062c4e46b0b011f46aed9704a99049995fea8b5115ff7ee26dad7e93cbcf54a8af7efc6b521109d77dc03c6f5284574d2e1b84c6829cec25610f24fb4bd66
-DIST pam_ssh_agent_auth-0.9.2.tar.bz2 237156 BLAKE2B b9d09920e10b454ea739e44c38daba6a509fbd4a96f01e26a82e0a8c58b696806b1f3ea95d53c10b55ed01e5804dfb687dd4545b87d85fa4f6a474548c3666d5 SHA512 e710a4dff315c8d79c5d5edc4ebe1629a8fc6d09651813fd4792a2021e7c2d5768d6b7e8539801e31b947cc30817f32375d751fc396707fc4f257df4f33cd408
-DIST pam_ssh_agent_auth-0.9.3.tar.bz2 239596 BLAKE2B 7be6af1c78457e082d34f5df406fccf74fbda48d1fe87be0592b927ea296b6db3cf1f9a58bcdd61c50556ffc53c16276dc87e5970d9caa0e51fb520e0473240b SHA512 c2304dcf623858339b5fd77bcf64e9c980a3ee241384b9125d64ba6ab9539a65eacbd3576b31a94bb390e4c089e702f9df2963119250b773bd8be872ae63a050
-DIST pam_ssh_agent_auth-0.9.4.tar.bz2 239250 BLAKE2B fee1e009a5374126db0b0df9f05436521e215933ed2eabdcd1983e6372fc7160c6a6c53d07b9ddc7bdd8b9529a27c7da4ef35aad2c80ea1ef2f895f3fb237135 SHA512 3d469e85bf7c49dcf9345c63678ebe050db4d15447592bc337bfc762f2337f92cebd7e840fc12d7be94acf1aa47b0272efe2c1688888ecd8f9daf63549520792
diff --git a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch b/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
deleted file mode 100644
index 3e259761a2e2..000000000000
--- a/sys-auth/pam_ssh_agent_auth/files/pam_ssh_agent_auth-0.9.2-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 3428c51..4b5ea8a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -48,7 +48,7 @@ PAM_MODULES=pam_ssh_agent_auth.so
- 
- SSHOBJS=xmalloc.o atomicio.o authfd.o bufaux.o bufbn.o buffer.o cleanup.o entropy.o fatal.o key.o log.o misc.o secure_filename.o ssh-dss.o ssh-rsa.o uuencode.o compat.o
- 
--PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o
-+PAM_SSH_AGENT_AUTH_OBJS=pam_user_key_allowed2.o iterate_ssh_agent_keys.o userauth_pubkey_from_id.o pam_user_authorized_keys.o pam_ssh_agent_auth.o
- 
- 
- MANPAGES_IN	= pam_ssh_agent_auth.pod
-@@ -72,8 +72,8 @@ $(LIBCOMPAT): always
- 	(cd openbsd-compat && $(MAKE))
- always:
- 
--pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)  pam_ssh_agent_auth.o
--	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam pam_ssh_agent_auth.o
-+pam_ssh_agent_auth.so: $(LIBCOMPAT) $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS)
-+	$(LD) $(LDFLAGS_SHARED) -o $@ $(SSHOBJS) $(PAM_SSH_AGENT_AUTH_OBJS) $(LDFLAGS) -lopenbsd-compat $(LIBS) -lpam
- 
- $(MANPAGES): $(MANPAGES_IN)
- 	pod2man --section=8 --release=v0.8 --name=pam_ssh_agent_auth --official --center "PAM" pam_ssh_agent_auth.pod > pam_ssh_agent_auth.8
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.ebuild
deleted file mode 100644
index 3faa51dfab8b..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.10.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir="$(getpam_mod_dir)"
-}
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
deleted file mode 100644
index 9d12c9d6d898..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libs.patch
-}
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-
-	doman pam_ssh_agent_auth.8 || die
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild
deleted file mode 100644
index 2ebe6d4f5743..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.2-libs.patch
-}
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild b/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild
deleted file mode 100644
index 0bc8de146ed8..000000000000
--- a/sys-auth/pam_ssh_agent_auth/pam_ssh_agent_auth-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit pam
-
-DESCRIPTION="Simple module to authenticate users against their ssh-agent keys"
-HOMEPAGE="http://pamsshagentauth.sourceforge.net"
-SRC_URI="mirror://sourceforge/pamsshagentauth/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/pam
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	virtual/ssh"
-
-# needed for pod2man
-DEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_configure() {
-	pammod_hide_symbols
-
-	econf \
-		--libexecdir=$(getpam_mod_dir)
-}
-
-src_test() { :; }
-
-src_install() {
-	# Don't use emake install as it makes it harder to have proper
-	# install paths.
-	dopammod pam_ssh_agent_auth.so
-	doman pam_ssh_agent_auth.8
-
-	dodoc CONTRIBUTORS
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1aa8d799cd68..3cb7ceb15cd7 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index ceb294f31c37..71bea6fd46a8 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
 DIST galera-25.3.26.tar.gz 3386588 BLAKE2B ca78a32dbaa6fd9eb46c40ddb26c97c788e529ad44040b4f720099b7aef2cee13631663cc5ecb7153288c12e7b4b156f988ff56633885e7ee75a0664cb1a90d4 SHA512 c462e70e8394ac4cfebca94320199ca4e012db100369788f3efdf1a04a8185908954e575fdb5714524931feeea432c2ed6f8d6ff985b1a47bdb16b4c4f54bdc4
+DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
new file mode 100644
index 000000000000..1e75a442128e
--- /dev/null
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
+
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://galeracluster.com"
+SRC_URI="http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/${P}/src/${P}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd test"
+
+CDEPEND="
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.41:0=
+	"
+BDEPEND=">=sys-devel/gcc-4.4"
+DEPEND="${BDEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=dev-cpp/asio-1.10.1[ssl]
+	<dev-cpp/asio-1.12.0
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+# Respect {C,LD}FLAGS.
+PATCHES=( "${FILESDIR}/galera-4.1-strip-extra-cflags.patch" )
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd -1 -1 -1 garbd
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	MYSCONS=(
+		tests=$(usex test 1 0)
+		strict_build_flags=0
+		system_asio=1
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index f6f23db8c744..b1f14907984a 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -5,4 +5,5 @@ DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild
new file mode 100644
index 000000000000..a1931590ff31
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index 484224936a53..c94d31e9c737 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -5,4 +5,5 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild
new file mode 100644
index 000000000000..6aa71f51b8b1
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 484224936a53..c94d31e9c737 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -5,4 +5,5 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild
new file mode 100644
index 000000000000..f519690e8b2f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.14.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RDEPEND="net-firewall/conntrack-tools"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index 484224936a53..c94d31e9c737 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -5,4 +5,5 @@ DIST kubernetes-1.13.3.tar.gz 28781320 BLAKE2B 7ae1a6ddeff5b8d19bacc868ad5970cc8
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild
new file mode 100644
index 000000000000..2830ac40ff36
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.14.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 66cd0cbe0fc3..e8bfe20bd05f 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -2,3 +2,4 @@ DIST kubernetes-1.13.4.tar.gz 28793464 BLAKE2B 0a637bf1003e4fd6ebabe09ebc0f3ca54
 DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4cc0f5556f6245b8e87aee5244e96ed6beede646f8b95b118d79ac715e988111f7fd2ddfb4c478af7a9bfe19c4dd227be SHA512 aced7b8dae452c62f4751785ad106c3747054ccb075b3d04dd82bd816d74f4002844e3cfa7aee138c9661e5c30a9aa9743f10a0dd807bbd590fffb60ce72f617
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
diff --git a/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild b/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild
new file mode 100644
index 000000000000..763c3838067b
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.14.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}/${PN}-1.14-openrc.patch"
+	popd || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index eef4941d9342..5c5eacf5b4bb 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -5,4 +5,5 @@ DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4c
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kubectl/kubectl-1.14.2.ebuild b/sys-cluster/kubectl/kubectl-1.14.2.ebuild
new file mode 100644
index 000000000000..7a61b25dce90
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12
+	dev-go/go-bindata"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d" -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+	pushd src/${EGO_PN} || die
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	popd || die
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index 3cd1482abe11..663b4907b0ad 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -7,4 +7,5 @@ DIST kubernetes-1.13.5.tar.gz 28804719 BLAKE2B 9ca1f24a26f5917c085fad65c3ed1cb4c
 DIST kubernetes-1.13.6.tar.gz 28822613 BLAKE2B 80c7a5e84328776d2e5d937b5a6c16491c07789e72aa69fae3c2e83d617323fab4d1ad75fb25d8533c3ecb2abe030cb0bb168c29d971a65fc7b07d736ddda8ff SHA512 42f2683ce5f74406efa87a0db5dc5ccd19a5de23c271af85ccdc325e24569234a1d5d16776a97eab1e46afd36699861ba4a4569fdd0017c639c1559e2de425a1
 DIST kubernetes-1.14.0.tar.gz 27797992 BLAKE2B e219717c866b0aba190ee13a480fb41a02335a629ecb655f826ae320456c60f71c1c3aaefadec45a5fb9cd4336871734eda964d062c456ca7eed556540d649b4 SHA512 dc748e4d9790e4ff17e765355b351a4fcec7a2bb5b87413bc4e36525c35fecc7d16add6111ac5ba787c311e2466c87bb76ca86105b7da9e056b66af81a700822
 DIST kubernetes-1.14.1.tar.gz 28008273 BLAKE2B 28ef62504544f33581a64ccf4c54a9b93fff5b92169db869291ac00f199993373cbef51a9d2562d76f12a5f2ee073018113b23fdac5b875ddfb8a01dba7f422d SHA512 c2923b539103f9f5d414972ccddb99856df8161d5e734b30eb1156fd5ed4330fa25fabb2a9afcc21f07fd2e8c66b2b1b769efc38f32b19237e9b7bc3172af180
+DIST kubernetes-1.14.2.tar.gz 28018596 BLAKE2B 6e80c6daa765bf7065b8479cdb7f4d921cc906afde69dcc9063583597010ab49d4b276dbe51f1eb0ecf09ce001b0e023e039307f7b8acb170276dd384f2e459d SHA512 921e3db96c1464906a44f15733067f038c7759737a603cb305671fb311cc12f892751afffa789ce7990b1168e7b42b01a5510f52ff5bc66d618782817437b08e
 DIST kubernetes-1.9.11.tar.gz 23606810 BLAKE2B 19d30d2cadaf5b95f919e82670b1a8e1d5e2b80a4134dbc5c6afcc23d06dee8392f63d80b59ebfbbbf3a4bcce0dc2d81b1d560c3b3b1910350efed35ee77fbbc SHA512 87881d7dd7e0b3e46dc92f3160410fdf9e7ec1f0cbc3ef99da84b808c3813a3a2d843d49e2b501ee3eb8c9db3564f62c72eecaf5dc1917051e81c106bc80a9ba
diff --git a/sys-cluster/kubelet/kubelet-1.14.2.ebuild b/sys-cluster/kubelet/kubelet-1.14.2.ebuild
new file mode 100644
index 000000000000..f38ce59e625d
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot systemd
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+DEPEND="dev-go/go-bindata
+	>=dev-lang/go-1.11"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"  -e "s/-s -w/-w/" src/${EGO_PN}/hack/lib/golang.sh || die
+	sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
+	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN} WHAT=cmd/${PN} GOFLAGS=-v
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin _output/bin/${PN}
+	popd || die
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dfaeed86c823..a42c3f3eca01 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index 2e5b49a6f05a..c29492125eb9 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1 +1 @@
-DIST xwmfs-0.82.tar.gz 193014 BLAKE2B 2e12ceb4fa1340e05342fccd0cb8978caa38525c59d646633aa32965a4d32efb9fecc4ef0ab0ed72ad57eb07ea821048a629943cbc3bde8d46f32ee1357bcdf0 SHA512 bcf0994a9f1c8dd9d22a4d41b074e406c7ded1e8b179155c6cd7272ad9720e3837b6aad1c70fb732848ded6f8c48261f30b6674ee8584fd1cae9325e6c25379d
+DIST xwmfs-0.83.tar.gz 193702 BLAKE2B 14319cc47b28f8ca7e0d8f18878d30c8c48eac8d1ef2238d82a18c59f6c4d3a4a11dc435627102b4fe1d41cc27201a59c9c9d04a73bede05996f053c5af08d03 SHA512 eeabf41d537cab53a34fe3b685a0d7bda8ff690bddd7d38271df71cb7638b045c8b1156fbb3a19220362590abb7a5808085bec30ce1652c9ba06c9af886cfdcc
diff --git a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild b/sys-fs/xwmfs/xwmfs-0.83.ebuild
similarity index 93%
rename from sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
rename to sys-fs/xwmfs/xwmfs-0.83.ebuild
index 0a3213274d9f..b64c09fda99b 100644
--- a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2e70354be9f8..a8cd014f3772 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 e060e5139e6e..ac78f99f5e75 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-4.14-122.extras.tar.xz 17488 BLAKE2B d04fec3b9eb350599786270edb0
 DIST genpatches-4.14-128.base.tar.xz 2840048 BLAKE2B 965e2b5c469fc30fc9f3542f8465a7b492f0215396dfbda37a35e68a1e6536213cf66f23909adfdc31fac0b53fca7ae1ce65c785a12f512925c3443a73707cc5 SHA512 b7f77407ed6d60cbcf4b60cf7334d0fef348e9dd68f33ae6920fc44ed171135b5df6b1012c1affd3cb570d92503e429f98ac0794cc697d7bc4b293f966f9edbd
 DIST genpatches-4.14-128.experimental.tar.xz 5228 BLAKE2B ba37a6cce365dfb193d3339d759010bec8f18b4ac558b104896b09c329941a09ba82f993103a1d8a18321f8a2495db3bba9639ac6b70d028dea5e32aa30c5443 SHA512 4aff0ff4a96ca1bc347a30a2bbc5232fd3d406931b74f62b8b3e57cddc02dec54d90a5d9de67e5e2c74942b68079952a9732dd2622398f290e4627d93db4510a
 DIST genpatches-4.14-128.extras.tar.xz 17496 BLAKE2B 87ddc81f1510f0a71622bd6867efa6b2cae6c2bd3eb184ea0c08219cc2692160918c1b57e46866d4b1bd70de821d8cd40f59702cc62b87ad1cb59d47654e55c3 SHA512 5610b4c2d3c0de6819dff887dddd7b1375df3ccf1c2c91c3f64565e8ce077e19e8c43288cb01265bddb0b1cd16c833a5795b39e94c3e167d9ad0c94db7270f0f
+DIST genpatches-4.14-129.base.tar.xz 2853096 BLAKE2B 0cf60aa21e39b529c0cba9ac1e387a126b0da1c60c4de834eb1bf39e39aa491ce00ddd244a8ba0f8ef98dbb24171b1b7bbe022f8335722062da23b2a0fe375b1 SHA512 fe549960e6a9595a09d6359ba75a13b0f7e77a08eea92406cfc5ba1a67e3319c69c340f74b448e2491be02f15f2f9843a84ce659a1685777e5ac53d0fd664d7f
+DIST genpatches-4.14-129.experimental.tar.xz 5220 BLAKE2B 22f3c813d5d0f1288166c4e2d8df2cee999b40e9f7ea4ec3287b32d67234ac80b03e6682156091fc1b9f8ea1887da0803ce946d49c44a21f6b3e81e5171fad7e SHA512 7ae95c0060d2a623ca001fdf50fbdb1974df9c721348dd7780bab0e3fb53eb9f7429962ee727e787f05d7fe20149a73806c6c79119f0f9b6d6a7860388402cdd
+DIST genpatches-4.14-129.extras.tar.xz 17488 BLAKE2B c491444d489f1a7e2ff8e012f4aeecd3aab37b6e5046704fb6c4601bc81e02bbe863a5d767086ab364673cde07def9a16dcbe5082bac0e587aa2f794ea627cd4 SHA512 a1bd8faf5fdd11500442e4ad46bde4d549cefd093ef34a3a1b971c9a6270810d1ad899265daf3e94f4b657f8ebcfe13a4aea88ce821cd61ebfa3f54cffad3bc5
 DIST genpatches-4.19-28.base.tar.xz 809620 BLAKE2B 2bf07264d3d65e7908b27727bbfb295c53a0cb2c8a9358bb41fa75a04b3094b0a9ca68721a440f6ffcbee3420b5cd31211f5e1673f8fe8043fdb5d913efe312a SHA512 00c9225dd966e02cba66b039e6bead431162d13b64c3a1680fd5c8b2f1f12af86bcb3c0bb553e88bdc12b4675d99be5944f280a5fad7fbf59e8bc6ab6d041ec8
 DIST genpatches-4.19-28.experimental.tar.xz 5804 BLAKE2B 6c4a52ce04f35a0c971ef438f32acec66395b763f725176312d4ea7e7467e9b2bab953afb64df744acc0827bb96cb13f2537427a56cee10dc95227300bfb6b02 SHA512 e04c94dd53325e89f25343999da5b66f4624605d66859884f2768c073b203126f7aad5fb5a1012fc56a4e2906fb2f3a3f8fda48d8e300a1a0bb8dc7c1719fa82
 DIST genpatches-4.19-28.extras.tar.xz 17480 BLAKE2B 599e85a011c87a7a9bcec44579fd4e54ff9ab78a4b8ee727f6b741acea29902c0531988d5abc6ff9512a205601363837639b5ba31190a044009bac13cb44067b SHA512 e201383a2fd00d063bd3d9817fbc40052db19e46db105ddb15dfd1dd90001a11de12495372f2225adcc80b620252ea20d49e73da46b8b3c88e62baa71a71a8c5
@@ -16,6 +19,9 @@ DIST genpatches-4.19-38.extras.tar.xz 17480 BLAKE2B e5a91594af32c1ad12b2c89316e3
 DIST genpatches-4.19-45.base.tar.xz 1284916 BLAKE2B d4bdbd0392400382d6baa9bfef5f71a43737aef688037865373eac04802a380c60265a6deaf3889702b5d023d695e30ec049bff0ddad74543ce8bdde034f29ba SHA512 82e23dbfdda4828d28fdbae5526a07e36a958387115fbb5dc9e6825439eb3fdba8602d490e0460e84cc2b3c8f21be15107a4db2aba73d4245b2a551f2010a470
 DIST genpatches-4.19-45.experimental.tar.xz 5800 BLAKE2B 66685ef52bc6ec8d856e66c2f96c1e2be0e6054c0ab126078e74d0f99fc4fbf6a184eeb50791a4d49d0f2e4c34d569d319a938d6c9bdd932ec549db2b274051f SHA512 89fcfd336aab90d068a02da9fbba85b954f8fb728c5fa9dbe8478300d32780bbb375929b31d18a032f5ec74547b05b40df3ce42c0236e67f9b9fed5e7c1a250e
 DIST genpatches-4.19-45.extras.tar.xz 17480 BLAKE2B f69d00cc9948456df19b0bbcad0f2c1767aa28e985c74fae8f2d702f8bb075b25b0132d42678820946075ef9373b85e17801c97c654157d656f6c9d34750e8c5 SHA512 71f9f57ca59026a01f5f4dcd7ffc7e62960328d4b5fcfc9e561b5d6a1073f90604f510e6656128fa6a2c23bb847b65643094c4b1cb20224a83611778d7aaac31
+DIST genpatches-4.19-46.base.tar.xz 1312108 BLAKE2B 7ed70fd23a1ff7283b48e29de56b177fcf86b2719eb424dd2850fef8110eeb7d9cd7f17a95afd4dcdbf441465d2906745dce1615fdd19b7a7e26205bc75a08ee SHA512 890e39f2241e690f97715d90adfa3176a8fe5742afbb82b11c9f8da7ffc620af2da1f6b850f3954faee6bbaebd10de5d0687516e96574dc630233dc7c01ef451
+DIST genpatches-4.19-46.experimental.tar.xz 5808 BLAKE2B 20d8b6a993c00e6668e90843e36dd8e393ad2fe1e7a4ad724677dd4d69803bc565859f23791063bac064940ca0d3231c7f48b14c1fbbcfa2eee896ad221c87dd SHA512 1a8d93387e8ebed75edd4298c9999a1b9077ba1b85964bfcae4a47cccc9d1aa4f8c2a59f0aadf59082b8ba892c15845e58da5067a4d304ad006bde1e52a5c280
+DIST genpatches-4.19-46.extras.tar.xz 17476 BLAKE2B 15ae4f55beb8763b33404c13072ce8be4f3083aa9c083a18d37c2c11d2d6b004033b9d502239058b3cc3fd5b0535cac17001eb3d74547c068046132839033e42 SHA512 5d0a92336105100697090e4aa8396a7073600011ceae4406c6b0106af6e9ac68130f0899a7e8244ec0a0d8ab729796934809d5874d855a6e4e12c59292a83684
 DIST genpatches-4.4-177.base.tar.xz 2683240 BLAKE2B 663016d9fc9bc7be441364e929d0bf6c2e78872c809174ddc08149f04d484a8abaaacb5abb58fb46bfac9704bd480ca446cb6bbfb2a12aab2e43dfc1313b12bc SHA512 1e3371429f322c76c619c89c8d99c15ee9c3413f7fc54e71a021732f6941ee1e385634e45877c834ed3cb3d7a1d1971c5a89de7fce5c456ec14fad0276bf9cb8
 DIST genpatches-4.4-177.experimental.tar.xz 83316 BLAKE2B 2ea31e71b0838d9ff82d195fc8f1412fd2224ed6863ce0bb8b44785f9c66905132a53acb6cf7ac4b612d85239cb719eb6cb790f79064eebf46e2977411219098 SHA512 498d59dafeb326cbf072c3b65ad1d44ad88a576a66d85131d979185787bfbcbf084cf193530f6df6eb0d4ff5b93135ce083c4c66abfee9991dff71ff2522c870
 DIST genpatches-4.4-177.extras.tar.xz 16464 BLAKE2B a46eddeea412631293ee0c3a4a4fa9fcc35967c4fc26986363b74f5182b495fad1cf66f2c4247eac128ba826d1a3bb36862929d1aa63a9a13e64f0700d8fa0f4 SHA512 250a2f2ddb8464fe245a41ace354b04047c9850b4073ce7764a24ebaee52d3dcf726771b222a976a806f08f6aa95e3ce4a226c5c6896484c029d08a9fe600480
@@ -40,6 +46,9 @@ DIST genpatches-4.9-175.extras.tar.xz 17356 BLAKE2B 7a8986357ce676b6b735c4e78506
 DIST genpatches-4.9-182.base.tar.xz 3094892 BLAKE2B 51d65136b98643b668e8a9e1e8f2f7e2db89b7c5ce73db432d2a9def5d46097e32fbfcc67bea94b84d00770cfb30cbea5bedb17f259e3efb87f0fb07312619f6 SHA512 c1a85146e744a13d73d3b600b6d43fe91bcd4e96b004cc2bfe8cb8ff6cdda91e84b054328eaaa70177c2132d013d00d778219947d9801933381562ddec3bf9a6
 DIST genpatches-4.9-182.experimental.tar.xz 106400 BLAKE2B cf46a596cacd79ba0ccea9f16a76354a20dc3d6b09d587fbe826fbd1e62cec4d2c7fdada11a9c6fa656ad2905923f136d0dbd8960af35072f315c3b31cfa8b1a SHA512 6d9a887055c095d58219159d2038a6b5d869c1ede51744e15d7cccfbe3c09d4f8574e9f792b5be6a4c102ced7ae706f3b3323cebaf131b4790ef7276a1a95b56
 DIST genpatches-4.9-182.extras.tar.xz 17360 BLAKE2B 86a04000c8361b00780cdba1fcd62d81501a5840948bc95b9570add0ee1d7b485842672b512ea8e241ea959daf8916e974cf0bb367b3730a7bf1ecad2b559972 SHA512 d6c805944012aadc2dc2528f205a791f8d368bcd8c0234c4d9e2628b999cce7982b36269457e42467c17f59038800ee9128ff0d0659b8f4156e645848df5aa83
+DIST genpatches-4.9-183.base.tar.xz 3104884 BLAKE2B 5adfd5fb68a7e910288a58adc1b8e8c2911d2fa14a3da4a7b0a86c21841ca3064cc71924c5f78c121e897b2cfdef4f64e352b5a7ce3cb66b113d505a58dfd69e SHA512 940fbed47b6b5bc31ec140569da7c09c577bd73b2862996fcdcb3bccbef62af52870b99daf96ac5466847b5f4c2fb41d24c468b2adf4b73297000609bb7f8e46
+DIST genpatches-4.9-183.experimental.tar.xz 106384 BLAKE2B dfa0939f0fce91abafbf869f5cc8f4c42297732e5b7793e5555d5326f1a392e51fe79f6ab6480f7b849bc327cc30f8952b47130eea34cb3b1fa6f0bb3cd2c98f SHA512 561fe1fb7a2158d86e1bacb56ce4f94cb7dea1c4a99bfbe492b0a6e391122162067ce298b79819c07a36eff826b411f9392147626d4b83cf38d2e132be0d84e2
+DIST genpatches-4.9-183.extras.tar.xz 17368 BLAKE2B b96629fef9107202f7d493cd12cbb9a0941a921e902457aac9a1130fc23e368cd84f5191ba021f65e92ccd017cfe70a8ba269b30d5221bf68cdbad1d1d0f88fb SHA512 09b832136b84656998cc2c4e5fc2f6b9a239e88ed4f2ffdce069e182ed525b3a001cd968f4d1825d31a7736357680c05b2a9df06ae4e515a0dd3087dbfd66a64
 DIST genpatches-5.0-18.base.tar.xz 529328 BLAKE2B 7180f31d9d286d43de08aec505ea79df741d56c2b08cc441941755d811b6410f7bca279343b2b8cf9389a9865a7575cc502e44f18330d66e4793c9c77cc0005f SHA512 4897fe00787e5136df302bbd4b0abe030199744ca10b2c9a23e229c5c5d54e6d2a5995d8b410bdd3c07f9736f338da480737b4c16de719d3d1d4e87b13484305
 DIST genpatches-5.0-18.experimental.tar.xz 5812 BLAKE2B 3d34ef9c257fc4902ee0a08c920b57b62cba8e9f93fcd48c0331f6d9d67b9cc9b230c10ef62c4a6bd6dd476f95a985307ef962ece782fef3ec564b9e08954913 SHA512 7ce3400126ad97e90fae510dc29bb0e330cedb97ff56696b0df0a77c1f49be7522de0e9e2aac084bde182001bcb74872c0ed6bab1c05d469fe5a0d66defb5958
 DIST genpatches-5.0-18.extras.tar.xz 1724 BLAKE2B 6751d1b8374d3c5781de3d47d6645263c71625ea665343483a79c1b824b3667dcf56923aeeb974d3f0c7cf802e45fb9931a627815e2fe7bc6d5855a3632ba865 SHA512 c63c44eab24600e44ccf96bf8a81eaa77561b61447d30085da0fe1ff8a6adac0ad6acd9a573b407e5abe5777961faa940c2e4e8c06de77afeeb8a8fed69d70a2
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
index c7c00740f2fc..a845383bed64 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.120.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild
new file mode 100644
index 000000000000..25f2674e5b2e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.121.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 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="129"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-4.19.44.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
index 214e59ac7654..77a4ca3056b7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.44.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild
new file mode 100644
index 000000000000..3538571c08c6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.45.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 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="46"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-4.4.180.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
index e2602ccb2fda..8ea147e979fc 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.180.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
index 716172c96fe6..8f52c587f628 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.177.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild
new file mode 100644
index 000000000000..750f00e67390
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.178.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 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="183"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 398592afd42b..f439b40eab43 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -226,6 +226,7 @@ src_prepare() {
 
 	# remove sources and documentation (wildcards are expanded)
 	rm -r ${source_files[@]} || die
+	rm -rf .git
 
 	if use !unknown-license; then
 		# remove files in unknown_license
@@ -236,12 +237,11 @@ src_prepare() {
 		# remove files _not_ in the free_software or unknown_license lists
 		# everything else is confirmed (or assumed) to be redistributable
 		# based on upstream acceptance policy
-		local file remove=()
-		while IFS= read -d "" -r file; do
-			has "${file#./}" "${free_software[@]}" "${unknown_license[@]}" \
-				|| remove+=("${file}")
-		done < <(find * ! -type d -print0 || die)
-		printf "%s\0" "${remove[@]}" | xargs -0 rm || die
+		local IFS=$'\n'
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' rm || die
+		IFS=$' \t\n'
 	fi
 
 	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
@@ -250,23 +250,12 @@ src_prepare() {
 	if use savedconfig; then
 		restore_config ${PN}.conf
 
-		local file preserved_files=() remove=()
-
 		ebegin "Removing all files not listed in config"
-		while IFS= read -r file; do
-			# Ignore comments.
-			if [[ ${file} != "#"* ]]; then
-				preserved_files+=("${file}")
-			fi
-		done < ${PN}.conf || die
-
-		while IFS= read -d "" -r file; do
-			has "${file}" "${preserved_files[@]}" || remove+=("${file}")
-		done < <(find * ! -type d ! -name ${PN}.conf -print0 || die)
-		if [[ ${#remove[@]} -gt 0 ]]; then
-			printf "%s\0" "${remove[@]}" | xargs -0 rm || die
-		fi
-		eend 0
+		find ! -type d ! -name ${PN}.conf -printf "%P\n" \
+			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
+				|| die "grep failed, empty config file?") \
+			| xargs -d '\n' --no-run-if-empty rm
+		eend $? || die
 	fi
 
 	# remove empty directories, bug #396073
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index dc5bfbb2dd22..3db79a409809 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,9 +6,9 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST linux-5.0.tar.xz 105235152 BLAKE2B 59635c87a4123c90ab8598c9ea5167096aa6bc765e9d8456d00f3da7530e89e925b3925c99f1a6c96ac0ded7df3ac7df52c75672f0a66acc40f563200892e064 SHA512 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST patch-3.16.67.xz 2401404 BLAKE2B 7741144b101d8c4d50e6caf002543a76ae83fa6c5d43cbdb0cd6183eddd744fa03a08f77568689d0083968ff3a6cc4da731e894552fb703dc6a52a365e225504 SHA512 defcc7a303434b9cbd374336f9ce4842d41351c305495200b1f3dadf533f328a01179cb4c7e0d2294de10ff0e42bc68555f5abb650211e81574b74953acd5aa1
-DIST patch-4.14.120.xz 2550764 BLAKE2B 2c9c7b76ecf8df717138b8e25216bfff3712af09cf416a78feb306eb8ec58199cbe00ab62f05e2673637fd0b59e8ba179c358047aaf1105fe492e7a009b9754e SHA512 a72e913d35bf2ffb06f27a233f48f9873835297dd3830455183f494e911542f43a4e59ff0bc6ffd8ec0ca6179d9433e795c3c0a8a9b173ec06866a3bc0f882a6
+DIST patch-4.14.121.xz 2560376 BLAKE2B f756ab490724f0f0749e3f21f46b9aafbc2d6420b2f651b076973e801cc3598cfdd90b62e9cc2384db55e31909662dd99f78136e992f84fbb810e6058a14828d SHA512 358302570cad582167118c3880ecd91dac32c9480997ee36dc3a3652b1e6f1d2f4f94ab59a2d234aa5dc09e205da5f89a1c99f088e75dca72f3e34da85fe6e93
 DIST patch-4.19.44.xz 1216956 BLAKE2B ddd1b02e562971a1ec888dadc7005b66e891714bae8ea8d37b0de4d6391707a3641781fb24abda410fcec2e4548968162d5ff0e77e8979e6503258339da450dd SHA512 1ad33fbb9939c0c537354ab310e0ca5d292cdd58b5126f5a2df661602b5c6ed8aeff001c3e3c6b6e7c45e0e33af1aa803bc1b51b61ec42ab644aad7479f98ad7
 DIST patch-4.4.180.xz 2544176 BLAKE2B d79d67e185d232d39b114e63a8c9682ecaa552264a1a2dfb3d325b83c80a0167030fd10c009609e06dfe7edbe1f694fd867c834051c8b5c4f0b63e0a8612935e SHA512 3218f5caa9b305eb6c9268f630a80e9f69f0477c14976c5902d27df570c199a7eda922f80ddae3814736ff16cdf03db4b6bda64119e5b24473ff8f887a907824
-DIST patch-4.9.177.xz 2761088 BLAKE2B 34272297ea007cf29b6a5471488d37ec4ebc964bf05697c348dd0c57a8130d5d2fb83fb1c5c5b2bac5a1492666928152ce2bad8c03e6129415f8d8fabbb4f840 SHA512 6c304fe467d3608508902e9d7dfff8b332e3c3771d668487f3d5ccec753d021ef0750aa09d08c3640965dc1f0a0c6968ca8d26973457eadfe3171d65396f482a
+DIST patch-4.9.178.xz 2768588 BLAKE2B 11c73d5674d87b52b78b70c456bb49df4a6122dc0703ef67f6fa9e7463dc34df739ff4df3d000da9ead7de27814de5b2e952be4545b2fe78b8c3d42545a56a47 SHA512 0e7c1e5a30164845f469a8c48db02729568f092ec590c20abf53481f20f4eed75ad21611e544b302baaec157c981cab47aa4dad03470eff3065a35ba994601d9
 DIST patch-5.0.17.xz 511416 BLAKE2B a1c3a81e696b246c5baed79cf82a237a080e00c5cf8a1a581ac01f278add2ee963d9eac2e7567b89fb62a35dea742dbc16102c65dc1505f6b52bac23efec1ca8 SHA512 08e294728bb65358d4e2e819a395effdeeec1df1f0d005906deaa48a7b27dc9795e905209394fcf60fed22092ad3db66b45bb327cab823bd6326efcaefddf31e
 DIST patch-5.1.3.xz 57928 BLAKE2B 129acfc548113160ece28398db20fa4f458a2b40557ea382c6a6cce0fa436bfb30e1a39a2e8ef8926d4682e9e8399d2fb5183c604bb3282687a9b9808079909a SHA512 5f7d13a9ded815dac613c133de9272f7ce7e8e4385e29db0f7125750d0e66c84205ac0c1412afd5beaf1b33f59a3f9ec11d41f2d0b4eda898af3c5b6c059c61e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.120.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.121.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.120.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.121.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.177.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.178.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.177.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.178.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9993ca553a61..4d02158463ec 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index f7db79467ef8..5bda543b97ce 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,2 +1,3 @@
 DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
+DIST ncurses-6.1-20181020-patch.sh.bz2 361598 BLAKE2B e74f6b4e81c822ae500724ebe707031d3157190e96256656940241e4485fa3d96669e069e764cecc829d9fccccc11caaab8c68ae489b083ade4f286647ac74af SHA512 e54bf83cae5bae3ddb909b9bbe91f549b366a5c60b6274f6b27a3f28b5f9f1afe7263487db842f8cbc22a93e0ef17f0fd518a0585523116e192174f44423ae4a
 DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f624937c4b66807668c22a608002ba6c38d876986f2c2b9ee46f91d087c88bc0b19920733e4c7ca0ed8e92d9d47de SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
new file mode 100644
index 000000000000..c96c376e5c8e
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs
+
+MY_PV="${PV:0:3}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="console display library"
+HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
+
+if [[ "${PV}" == *_p* ]] ; then
+	SRC_URI+=" ftp://ftp.invisible-island.net/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2
+		https://invisible-mirror.net/archives/${PN}/${PV/_p*}/${P/_p/-}-patch.sh.bz2"
+fi
+
+LICENSE="MIT"
+# The subslot reflects the SONAME.
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+#	berkdb? ( sys-libs/db )"
+# Block the older ncurses that installed all files w/SLOT=5. #557472
+RDEPEND="${DEPEND}
+	!<=sys-libs/ncurses-5.9-r4:5
+	!<sys-libs/slang-2.3.2_pre23
+	!<x11-terms/rxvt-unicode-9.06-r3
+	!<x11-terms/st-0.6-r1"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.7-nongnu.patch"
+	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
+	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
+	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
+	"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
+)
+
+src_prepare() {
+	if [[ "${PV}" == *_p* ]] ; then
+		eapply "${WORKDIR}"/${P/_p/-}-patch.sh
+	fi
+	default
+}
+
+src_configure() {
+	unset TERMINFO #115036
+	tc-export_build_env BUILD_{CC,CPP}
+	BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
+	# Order matters here -- we want unicode/thread versions to come last so that the
+	# binaries in /usr/bin support both wide and narrow.
+	# The naming is also important as we use these directly with filenames and when
+	# checking configure flags.
+	NCURSES_TARGETS=(
+		ncurses
+		$(usex unicode 'ncursesw' '')
+		$(usex threads 'ncursest' '')
+		$(use unicode && usex threads 'ncursestw' '')
+	)
+
+	# When installing ncurses, we have to use a compatible version of tic.
+	# This comes up when cross-compiling, doing multilib builds, upgrading,
+	# or installing for the first time.  Build a local copy of tic whenever
+	# the host version isn't available. #249363 #557598
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		local lbuildflags="-static"
+
+		# some toolchains don't quite support static linking
+		local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
+		case ${CHOST} in
+			*-darwin*)  dbuildflags=     ;;
+			*-aix*)     dbuildflags=     ;;
+		esac
+		echo "int main() {}" | \
+			$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
+			|| lbuildflags="${dbuildflags}"
+
+		# We can't re-use the multilib BUILD_DIR because we run outside of it.
+		BUILD_DIR="${WORKDIR}" \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
+		do_configure cross --without-shared --with-normal
+	fi
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_configure "${t}"
+	done
+}
+
+do_configure() {
+	local target=$1
+	shift
+
+	mkdir "${BUILD_DIR}/${target}" || die
+	cd "${BUILD_DIR}/${target}" || die
+
+	local conf=(
+		# We need the basic terminfo files in /etc, bug #37026.  We will
+		# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+		# src_install() ...
+		--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
+
+		# Disabled until #245417 is sorted out.
+		#$(use_with berkdb hashed-db)
+
+		# Enable installation of .pc files.
+		--enable-pc-files
+		# This path is used to control where the .pc files are installed.
+		--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+		# Now the rest of the various standard flags.
+		--with-shared
+		--without-hashed-db
+		$(use_with ada)
+		$(use_with cxx)
+		$(use_with cxx cxx-binding)
+		--with-cxx-shared
+		$(use_with debug)
+		$(use_with profile)
+		# The configure script uses ldd to parse the linked output which
+		# is flaky for cross-compiling/multilib/ldd versions/etc...
+		$(use_with gpm gpm libgpm.so.1)
+		# Required for building  on mingw-w64, and possibly other windows
+		# platforms, bug #639670
+		$(use_enable kernel_Winnt term-driver)
+		--disable-termcap
+		--enable-symlinks
+		--with-rcs-ids
+		--with-manpage-format=normal
+		--enable-const
+		--enable-colorfgbg
+		--enable-hard-tabs
+		--enable-echo
+		$(use_enable !ada warnings)
+		$(use_with debug assertions)
+		$(use_enable !debug leaks)
+		$(use_with debug expanded)
+		$(use_with !debug macros)
+		$(multilib_native_with progs)
+		$(use_with test tests)
+		$(use_with trace)
+		$(use_with tinfo termlib)
+		--disable-stripping
+	)
+
+	if [[ ${target} == ncurses*w ]] ; then
+		conf+=( --enable-widec )
+	else
+		conf+=( --disable-widec )
+	fi
+	if [[ ${target} == ncursest* ]] ; then
+		conf+=( --with-{pthread,reentrant} )
+	else
+		conf+=( --without-{pthread,reentrant} )
+	fi
+	# Make sure each variant goes in a unique location.
+	if [[ ${target} == "ncurses" ]] ; then
+		# "ncurses" variant goes into "${EPREFIX}"/usr/include
+		# It is needed on Prefix because the configure script appends
+		# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
+		conf+=( --enable-overwrite )
+	else
+		conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
+	fi
+	# See comments in src_configure.
+	if [[ ${target} != "cross" ]] ; then
+		local cross_path="${WORKDIR}/cross"
+		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
+	fi
+
+	# Force bash until upstream rebuilds the configure script with a newer
+	# version of autotools. #545532
+	CONFIG_SHELL=${EPREFIX}/bin/bash \
+	ECONF_SOURCE="${S}" \
+	econf "${conf[@]}" "$@"
+}
+
+src_compile() {
+	# See comments in src_configure.
+	if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+		BUILD_DIR="${WORKDIR}" \
+		do_compile cross -C progs tic
+	fi
+
+	multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+	local t
+	for t in "${NCURSES_TARGETS[@]}" ; do
+		do_compile "${t}"
+	done
+}
+
+do_compile() {
+	local target=$1
+	shift
+
+	cd "${BUILD_DIR}/${target}" || die
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.
+	emake -j1 sources
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files || die
+	emake "$@"
+}
+
+multilib_src_install() {
+	local target
+	for target in "${NCURSES_TARGETS[@]}" ; do
+		emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
+	done
+
+	# Move main libraries into /.
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a \
+			"${NCURSES_TARGETS[@]}" \
+			$(use tinfo && usex unicode 'tinfow' '') \
+			$(usev tinfo)
+	fi
+	if ! tc-is-static-only ; then
+		# Provide a link for -lcurses.
+		ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
+	fi
+	# don't delete '*.dll.a', needed for linking #631468
+	if ! use static-libs; then
+		find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
+	fi
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+}
+
+multilib_src_install_all() {
+#	if ! use berkdb ; then
+		# We need the basic terminfo files in /etc for embedded/recovery. #37026
+		einfo "Installing basic terminfo files in /etc..."
+		local terms=(
+			# Dumb/simple values that show up when using the in-kernel VT.
+			ansi console dumb linux
+			vt{52,100,102,200,220}
+			# [u]rxvt users used to be pretty common.  Probably should drop this
+			# since upstream is dead and people are moving away from it.
+			rxvt{,-unicode}{,-256color}
+			# xterm users are common, as is terminals re-using/spoofing it.
+			xterm xterm-{,256}color
+			# screen is common (and reused by tmux).
+			screen{,-256color}
+			screen.xterm-256color
+		)
+		local x
+		for x in "${terms[@]}"; do
+			local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+			local basedir=$(basename "$(dirname "${termfile}")")
+
+			if [[ -n ${termfile} ]] ; then
+				dodir "/etc/terminfo/${basedir}"
+				mv "${termfile}" "${ED}/etc/terminfo/${basedir}/" || die
+				dosym "../../../../etc/terminfo/${basedir}/${x}" \
+					"/usr/share/terminfo/${basedir}/${x}"
+			fi
+		done
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" | newenvd - 50ncurses
+
+	use minimal && rm -r "${ED}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}" || die
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	if use doc ; then
+		docinto html
+		dodoc -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
+	use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0f23661c77bf..4ed535f2ef3e 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/cronie/cronie-1.5.4.ebuild b/sys-process/cronie/cronie-1.5.4.ebuild
index ed86f92448e9..2afa41518d7c 100644
--- a/sys-process/cronie/cronie-1.5.4.ebuild
+++ b/sys-process/cronie/cronie-1.5.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/cronie-crond/cronie"
 SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
 DEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index b2372a1437aa..84d0d6dd1760 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/imap-c-client/imap-c-client-2.ebuild b/virtual/imap-c-client/imap-c-client-2.ebuild
index ea089863c118..709a7089f23f 100644
--- a/virtual/imap-c-client/imap-c-client-2.ebuild
+++ b/virtual/imap-c-client/imap-c-client-2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Virtual for IMAP c-client"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="kerberos ssl"
 
 RDEPEND=" || (	net-libs/c-client[kerberos=,ssl=]
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.220.ebuild
similarity index 100%
rename from virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.200.ebuild
rename to virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.905.220.ebuild
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index ba516bcba5ad..77f168bd4d3c 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 e2eea2874224..e4e85834e3cf 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,3 +1,2 @@
-DIST airdcpp-webui-2.5.1.tgz 6571762 BLAKE2B dd2d02913125c8166c1ca0f14d9276eed073fa58a46ddbf2ee5e70a97e081852e96a875c9f501781b81de0d2163c4c391c5aa3d078f6946fe35109fe901d8bb5 SHA512 771595f529361330fb54796b32fed61aa8fb37ef1ddbb551c10a8b6352eead6afe7e8a52df223c7e53c27942dd301f50b7234eb915ee378e90eb6ac847b16871
-DIST airdcpp-webui-2.5.2.tgz 6715659 BLAKE2B cfbd185fea4e4b9c07508f9cb29ecd312b004e63a8ce26c2fb0695895fc85e4e657b6813c69e05905ac950eea9288ba01df7814fd5106cce2933ebadc17fb82f SHA512 08dbbb5bcafb1b991f283c6975626843e96818cb02eaf3b0a5a7c700f64780dd18cc897343c57d2f46235c77d44b1da17f8d66fb0f021d75be164a6709978650
 DIST airdcpp-webui-2.6.0.tgz 7829663 BLAKE2B 2c0859598414f456cdca0ef8f0777580d64be6ecc0678e126b61acfe1c2b0cf3361d37b5ff49c89d897953bf998305d2062eb4b55336ddd6d37c52e3c46363c4 SHA512 e4556c0d5697ffcb4d0b4a7f297f9652c339bd1f66242765a74eaffdca077ccbdb323dd70485df34f39e95abfcdc9252280eb28f67cd50a1c28291385dcb2286
+DIST airdcpp-webui-2.6.1.tgz 8418223 BLAKE2B d5f271909d20e8719d707e9eefd464379ec41c8cec378440f7a4483fef1f8c40e119cf827cef88e15c6925d02e71cd4d16dc9471fd5830c9e5bd8ae67a4b02f6 SHA512 be03b595a1f2ffc1bb35835d4bab0eb035dcbee0351aacad529dd4b93fa67af866ab9778a579410ecb8075ede5be8b10eb7cc89eab97f0d2a3f502889cd84fa8
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
deleted file mode 100644
index 898d2fa96dc8..000000000000
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 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/airdcpp-webui/airdcpp-webui-2.5.2.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
similarity index 100%
rename from www-apps/airdcpp-webui/airdcpp-webui-2.5.2.ebuild
rename to www-apps/airdcpp-webui/airdcpp-webui-2.6.1.ebuild
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index a692d2ea4115..62b93f452305 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,2 +1,2 @@
-DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
 DIST klaus-1.3.0.tar.gz 35363 BLAKE2B 881f9bd1a80d4a580a0dc84a7b8528a5703777817495639bb3ea8f608c2495287a37fe43839d0c64002e1d36453d37f116c73c9a7ef93651bc8a2d010d4d2e2c SHA512 c159d8195b1bde43f46d013f0337e998d905b1f3a9a23caf5f71180d19192c3c391cc5143545bd3d05a2aef45451a43e873ca3828c8f9f69ae3eaaa0d00560cb
+DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
diff --git a/www-apps/klaus/klaus-1.2.2.ebuild b/www-apps/klaus/klaus-1.4.0.ebuild
similarity index 75%
rename from www-apps/klaus/klaus-1.2.2.ebuild
rename to www-apps/klaus/klaus-1.4.0.ebuild
index c7fba3e90a36..1966b9410b74 100644
--- a/www-apps/klaus/klaus-1.2.2.ebuild
+++ b/www-apps/klaus/klaus-1.4.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1
 
@@ -17,17 +17,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE="ctags"
 
 RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.13.0[${PYTHON_USEDEP}]
 	dev-python/httpauth[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
-	ctags? (
-		dev-python/python-ctags[${PYTHON_USEDEP}]
-	)
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	ctags? ( dev-python/python-ctags[${PYTHON_USEDEP}] )
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 # The tests can only be run from a git repository
 # so they are not included in the source distributions
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 5efb32e5aefd..217c8d196cc4 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,2 +1,3 @@
 DIST moodle-3.5.6.tgz 46703461 BLAKE2B edd438ffd4f1def04f9619150d8ef486323a5e9f458124d317d36e01eb79e2d0ed0039d8dba43a3956aafc8e92c8d2276b6be730607031ba0e561b62a24488ef SHA512 0a08359576665f78d2370d3f2796dd53cba692c5fe68de7cdf8478bb1f24136c4e78149fa6a3c37118015fdf7a401c50913d151b4b38d9928989255688df73f3
 DIST moodle-3.6.4.tgz 47736743 BLAKE2B b3a41b0025651e161a1ee76ec1c121666e8dd0d830a05165b6c4419dff3caccb5fd006434f5e8284b81bd892a1c184d8a008e2b948d3b63c472f31cca55dc77e SHA512 b3b3b138f8a2779dc41f25656a5f2640afa2f3b933d9e2f99065e176d1f5b6c9c4f8bdf8af53af04957eb520043e1c7c53ff6309896e399f4a012f624481ae44
+DIST moodle-3.7.tgz 45708647 BLAKE2B b4ce21bd98d91ad81f095c00aaee6c30fac238cf54de079e1021ec94109a24aee97f2d9aff0e99a6594c35cfd8ff7e06b83415109992df90e858d88ae8b66033 SHA512 ca3efbb146253e856ff6988abad4bd071e26599ba45e60186e89bda45b06b610de1e88aa165e5ac992e00f23772e932ffe770402c699898d128a3357f02ac895
diff --git a/www-apps/moodle/moodle-3.7.ebuild b/www-apps/moodle/moodle-3.7.ebuild
new file mode 100644
index 000000000000..02e7fab65927
--- /dev/null
+++ b/www-apps/moodle/moodle-3.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="https://moodle.org"
+SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.1[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 20446307543d..464021dc0eca 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 7db069bb4cb0..2bdb9d1d1b6b 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -82,177 +82,177 @@ DIST firefox-52.9.0esr-vi.xpi 450805 BLAKE2B 9dacebac235a738cf7f068e16335b8b15ca
 DIST firefox-52.9.0esr-xh.xpi 441173 BLAKE2B 3e1b907a7659c639d17d25a1825f472853242891d55f6a5ad93c1f5a12e12f05706173dc6ef5594f27e049d9b9a4c748d7371780843f1da204c5d93a39213197 SHA512 54ac64f0c119ab42d4f87dd2663ba7e14310c215a1ea76acd463b4c1a9073491f8df8c9b03d391ecc6f9ffbbdccc3756a7b13ed559336a6d1527fad3097ddb53
 DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721bae06694768316e31a2aed608e3050f585a9603375cd35b90affca11b3e5e44401b1e676f9c8050ade287ed0feb442a7a SHA512 ca62e0e2ab075086741159b185b5eba44c6bdfc29fd9ba1cf25808f127c1aed8875ea61c1c33e4f742fa26af4455a8873730f96ad9c7bec1f66aed0595f253f1
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
-DIST firefox-60.6.2esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
-DIST firefox-60.6.2esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
-DIST firefox-60.6.2esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
-DIST firefox-60.6.2esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
-DIST firefox-60.6.2esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
-DIST firefox-60.6.2esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
-DIST firefox-60.6.2esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
-DIST firefox-60.6.2esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
-DIST firefox-60.6.2esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
-DIST firefox-60.6.2esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
-DIST firefox-60.6.2esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
-DIST firefox-60.6.2esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
-DIST firefox-60.6.2esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
-DIST firefox-60.6.2esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
-DIST firefox-60.6.2esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
-DIST firefox-60.6.2esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
-DIST firefox-60.6.2esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
-DIST firefox-60.6.2esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
-DIST firefox-60.6.2esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
-DIST firefox-60.6.2esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
-DIST firefox-60.6.2esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
-DIST firefox-60.6.2esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
-DIST firefox-60.6.2esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
-DIST firefox-60.6.2esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
-DIST firefox-60.6.2esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
-DIST firefox-60.6.2esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
-DIST firefox-60.6.2esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
-DIST firefox-60.6.2esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
-DIST firefox-60.6.2esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
-DIST firefox-60.6.2esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
-DIST firefox-60.6.2esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
-DIST firefox-60.6.2esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
-DIST firefox-60.6.2esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
-DIST firefox-60.6.2esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
-DIST firefox-60.6.2esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
-DIST firefox-60.6.2esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
-DIST firefox-60.6.2esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
-DIST firefox-60.6.2esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
-DIST firefox-60.6.2esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
-DIST firefox-60.6.2esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
-DIST firefox-60.6.2esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
-DIST firefox-60.6.2esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
-DIST firefox-60.6.2esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
-DIST firefox-60.6.2esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
-DIST firefox-60.6.2esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
-DIST firefox-60.6.2esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
-DIST firefox-60.6.2esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
-DIST firefox-60.6.2esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
-DIST firefox-60.6.2esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
-DIST firefox-60.6.2esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
-DIST firefox-60.6.2esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
-DIST firefox-60.6.2esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
-DIST firefox-60.6.2esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
-DIST firefox-60.6.2esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
-DIST firefox-60.6.2esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
-DIST firefox-60.6.2esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
-DIST firefox-60.6.2esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
-DIST firefox-60.6.2esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
-DIST firefox-60.6.2esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
-DIST firefox-60.6.2esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
-DIST firefox-60.6.2esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
-DIST firefox-60.6.2esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
-DIST firefox-60.6.2esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
-DIST firefox-60.6.2esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
-DIST firefox-60.6.2esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
-DIST firefox-60.6.2esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
-DIST firefox-60.6.2esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
-DIST firefox-60.6.2esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
-DIST firefox-60.6.2esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
-DIST firefox-60.6.2esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
-DIST firefox-60.6.2esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
-DIST firefox-60.6.2esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
-DIST firefox-60.6.2esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
-DIST firefox-60.6.2esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
-DIST firefox-60.6.2esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
-DIST firefox-60.6.2esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
-DIST firefox-60.6.2esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
-DIST firefox-60.6.2esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
-DIST firefox-60.6.2esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
-DIST firefox-60.6.2esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
-DIST firefox-60.6.2esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
-DIST firefox-60.6.2esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
-DIST firefox-60.6.2esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
-DIST firefox-60.6.2esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
-DIST firefox-66.0.5-ach.xpi 463182 BLAKE2B a804865f36afcca09c96c1c2bcf74b11273cd4df87ab742fe111335f2301b6780ebddcf7db167584ce45d019f6766f6c0f585c0057f4fd198358cfa668efd742 SHA512 18f0b076fb3bba6d2993a55b66f1f6541517281fd83d3dfa7ba8b77df29499e0239bde21120fbb4b9cc3c42d8b7c3fc083191a0969465c76e74f2bfc98c00f22
-DIST firefox-66.0.5-af.xpi 456307 BLAKE2B 56e350abcf0e85bc967eb140f0289be3d5d17ec7e9c5969cb81aafc8a59af8c95a2d5ea6dc5bb3b2f3c0ee02ffc3e879c02cb37caba4c8b83c75a3ef8c2cbe48 SHA512 1477ba6dd00023d71d9064910aa393340ffd8ebd534e47880e981175ddbdc44f44f163a69f2996a43e4968d34d2ef7360e274745ebce241cd2a97eee6c61c9ba
-DIST firefox-66.0.5-an.xpi 480236 BLAKE2B deed3525bca835e63044e8feaa289422c9c42f053b3d7e91b7e9fbaf339915836f6cf9a12fb0152896de989a08d9bb19d62974128d240eb71511e4247982becf SHA512 174c1b3635e9b1aa0fa68e7b430a80349090132970e5a21e578a0ca6103df0d26268982f6818ee53dd7b06e6b87f6a7106b526ae3331d32d745dd68ab751f634
-DIST firefox-66.0.5-ar.xpi 532257 BLAKE2B 1564b7fc0de82a6dd45aff89b180d812bd84715d984e3db79c10ca1ad834146880c21991e0b882702f841f66072d3b502ac7e177bf5ffbe84aa55424aa1f2b33 SHA512 c896955f10e1b3b51674b2ab2d82e92bbaf72626041065aae889c619727daf3209f842078ace4d17ef8b16578be41f66dcdc6bd4f5efdbfd54cc3a664614d60b
-DIST firefox-66.0.5-as.xpi 492229 BLAKE2B 2617a6527fa87c8968fac4d5c2f6be3a8b18b1b36471269340dacaaecd3759bfbb38f6e12bc646822095c7d720aa6a0081e57401af8473b2370fbb903e0e5ea9 SHA512 189c22eecac9623b313e40aa9d147908b03ba9d68114d03386262a0f1ad9f4df3eb69bf2599dc8ffe1af95f19907c4409c39f63d55dbca32a6d70adc593e191c
-DIST firefox-66.0.5-ast.xpi 480138 BLAKE2B 666e04bdd67daf9e9a9c72beba20437f62032c2c042e1db088f56730334d3a334b766d968b646d587b1fc8cc7aba7683dcc54fcf63f200af9523623793e3b6e7 SHA512 4400120a09cc1649fa17441f052783218347a13d6e90ff5924ebeb6a86387825a4a8687007bc826762042109bf8a617b810f4a5ce78281190701ef979348b730
-DIST firefox-66.0.5-az.xpi 505913 BLAKE2B ca414a7ecf7ad41e55ae3320e4d78e95e2190394954fca83c75ac8ef266abebdf2cb6713213bbcf818f0f4d8ba1412ca9238e824e0b2f1ff414eb0751509b8ef SHA512 8f19aa56ac114c85eae4ed3cdcaf3d0e733351d64a8792850b6e5b59a96ec5157794a8a13b3030b723e3ede60a70843a43358c3a163d519a3debe3d58bcd51fb
-DIST firefox-66.0.5-bg.xpi 542709 BLAKE2B 50d23a81211e62ea08767aa63c89c41b736a94f6c9f3ae89890e5b6c89a4da53caaf39d1e75f336043aeb7ceb6ec2614303eff2d3ea176926a0e2a0320f01b7e SHA512 6e47cecc463a2682e47052f2f1a63f82c949e103f01ae27c6b443c8f502f83ec02c1d909e738a7d13c75d0778a7545ed069cc6216eb18360e88450d4fead5727
-DIST firefox-66.0.5-bn-BD.xpi 560583 BLAKE2B 9899eb511e781ffc098c8719cccdc6fdfa578459475a632f8b2da16175d00204bfede6d55b8513f16c319885d800befc1fa5383cc222c3f34db125c3d1dad946 SHA512 2c55a81d5f356593a4dfc3943161cf282de7ef4d2c6ddbce5240e1d676405241d351e8fa57706c80da97d58b6ab47b80755fd863050f215d85c71e756ab22bc7
-DIST firefox-66.0.5-bn-IN.xpi 550593 BLAKE2B 5c31b8f1a948e87b65929335819bdc907a7111550e268927cc469190460d78e7c7df86701a7a93e7915854489c1c106a439a878ce43d98098359b69c1400a8b6 SHA512 63e191e7410d19ecf6e73dfe110060aaad17364bfc4a86fa883ef499b2a1440a35e2a19a26831a50c9d18c440dca9b4b6818f2486b91f2d62db5709dda8249dd
-DIST firefox-66.0.5-br.xpi 485448 BLAKE2B 3874e8e18c78de77a654cc592370936b93cd69f82dffd8b25afef618482925d9ff4c35193fbbed227935e3b984e29ebfb4b49ad76b6eb48b6318b5b0e94db089 SHA512 d91263dde2e5b65dd5a399dbcf0ddea81b41789ae44e994673652cf74e2d9c36c760bbb000518f61a1be50e6f82c84805c110b7be1916339a816653427b12786
-DIST firefox-66.0.5-bs.xpi 477852 BLAKE2B 77c24514e96e6916edc849cab383437dffaba9d5591e418c93a3853f42520cdec5eb21ffb36ede0a3cae7b878086d090f3d720d09d916ff69674d7482b2b84d9 SHA512 eb10a6cd6da5959d4c7e782c9a4a3d1fdd5ad6e054fed2b53a057694a509064d75c91c7d05e66ccb25738842128ad1f195f9be37772110bcb38f101da7b2e496
-DIST firefox-66.0.5-ca.xpi 486084 BLAKE2B 41b266935bd3f0c2b7b8c8be7b518ad2e76b43f670fe7147a91b27aa9c356eb29952d22d696181edec0ea48a0fb6152ac00f938bc1b7989d369fc7bda9d3de19 SHA512 f13410baa63afcb969243db0a3bdd7e838911bacb5ed2cdad842df578f52242e5be0274b5a3f26916901c0a6f8acdfab9265a9883cbc9d7366f0113e77290061
-DIST firefox-66.0.5-cs.xpi 500290 BLAKE2B ca990035cc5282bdc1ea77ac07e30b12ddd131b3ee71b2039e99770df2fdb91990a9d10b626601f454f773d37e1a33fa77b7f06968982467097a6bd564e9637e SHA512 b42206f8307286b8f59550df029c1f51a99b77247845d8d8022bd9eb4a708b22bdc46f09548a0fb492c3da5d0809f113b8a1081c8a06a163fab6601c18f0559d
-DIST firefox-66.0.5-cy.xpi 487249 BLAKE2B 4603bd82ca342a2e4897ed85c63b086bbbf9fc790f21651b21ca9d970fa8680827e8937d03b710997fe9fc0765225d4f4ea79fea8c387ada6bf62f58389cc1c4 SHA512 aa3f37772435f257ddb64cd2aef9e3a00c2dbfbc9c1c466795f5fc948199fe1e5c7a3f31528027cfe72add3d5e697b7fbb5ed9282a6f4e6b7e7f06c01904ce29
-DIST firefox-66.0.5-da.xpi 498347 BLAKE2B 68cd62b41641f831b04cd8d60de9d3959beaa371b4687f5e347d5de03a54a94543805871e60563b5bd523d1de9ed966f80be5f7fc1f7e8713bab5fe099d0799b SHA512 0127cd0f76b138c387c0115dbe61054c3e60d97a830fb2a5c37565bcd0d656e10cfb29c901f74db997755f8cd4b81e7d99139aa55a21c0bfe334a267e146bd55
-DIST firefox-66.0.5-de.xpi 497259 BLAKE2B 971c78d891cb9769b01fe30ca21ee16fcc058d77204a4bef40cc2f31df158ff113532d0e05713d76d1296f52d21bf9a5b4c2226475eedf38c65c1506dcc221b9 SHA512 092179b4bba6ccf680e3b293a1aa74410c0454a4c268ac030383603b5acab7395707b4e4043b60eeada82f19cbd88281c9268d7977ce8498db163b6b2b5dd5e1
-DIST firefox-66.0.5-el.xpi 569713 BLAKE2B 8d0dbb718c474f0bfb8e989d3035219470a657368de213bcaf2321a71c3fb20b46182c3c190ebf6c2e3fe51567ebc607588c99f596108807216a23c5b7c942a1 SHA512 460325249bd17c39f8ce928ba80afd627ce27a8ff43b98d25332a1ffd89a8420c787dfda21ead92dc140ca5b9402a5447d8712e6660c15be807b1d569825c30f
-DIST firefox-66.0.5-en-GB.xpi 460278 BLAKE2B 2a1d6f0f9b23e17df4c74762aab162e27a70a939435a8afc21326b98a205414cc4f5f58e761c75389c56cbdcf1b9c5e22b247848c8fb391d5b3b9e8d8a3fefec SHA512 0654d8703c01d9299e630c6092a037a7b728cdd7deb0c90a62edd29a79a6b7d3f22a07d618ae43fd85817facbc8b34cd27d26e8ce7520c4081fac27eb449ad95
-DIST firefox-66.0.5-en-ZA.xpi 439441 BLAKE2B 8edd8a25507d987937cb98d8d6aa7b1e4cfd2761227def8228b4da700821d398c03add70952a9e47eba62a7d3ce17b8e31981c0e0ad14741dc8a02371c41b93d SHA512 ee92b3398102fd4761798e859838a2e8f98d77d217c8ccad2a1519c06ee4ff1f24ee3ad8ed1a6183ef25647a5389b0270a50dfc8c0fa12f4d219e87ca42d9de4
-DIST firefox-66.0.5-eo.xpi 486267 BLAKE2B 222440dcd8afd077c54ccb5bead4aa608178ee469343af6c36a4c8074df4ef9c909a875cd9883b014c4269f96c32fadde88ffa268ad3ff462bc02c9e1f7cf236 SHA512 a2f3db501633d3265bee5b57cf004fe690f24d3b7131ceec1c5060ce0dc29febf06f332bd9878be997ebd0389b8fa3a9049636f985e49aad85479fc2da4c69cc
-DIST firefox-66.0.5-es-AR.xpi 493717 BLAKE2B eb1ae3bbc4bd03bf53608e7069bef7f5405d4b8def6b59ebb1f09845caf45095dba2700c31c8115768c246413777a4e14816d7a5d7da4195730e19c4d0e65a39 SHA512 0efb92623dcd9a90444e58e98bc4b563160cc055fdd53465fbe59172725ab21fd63e4f1f75fbc507a03b83c201a58a362c10cffa69b7cb302721a058be35b301
-DIST firefox-66.0.5-es-CL.xpi 490323 BLAKE2B 39280859c2ee69af2570896309ab8c69369a6eae72f26a4af6256c405eb3a7d33dafb71e02d27c4948a44f15393ef9db477359cfdc97deb5cd573a9e0e61f23c SHA512 8aa6eca4fd3285b9d7bfbf71f27a56443fb79072c98eb659089ee9b841eae6292bce31897a367923007652385a6bc695f1641057acf669498ddd2040bb3a1e64
-DIST firefox-66.0.5-es-ES.xpi 454509 BLAKE2B dff1ce7c322bf731078d55c7ea0411070fce31b29a334e04bb20ec2a1401c03627fff4c573938adcef238492e47890cd1c6ac99737ccebdf3584edf5e525b156 SHA512 26efb80ba15483d01ec84af57a1e73ef5aaf803dd18546ebfd4f28d59323266a113f1e94d019f3057aa4e99cc9d1cd055ae55a193370b690f293d39ff9baf5c1
-DIST firefox-66.0.5-es-MX.xpi 495353 BLAKE2B 8b0d84fab7d67c9dc491c4ec4bf1c801012170bbde1f6991cfad50fcd1a0a7475615caff6817b9782891d96d2de2a5d596b166f1633b6f5963d2fc5f9054afe0 SHA512 632037d8d621db9f19fae0f240e9401917bec769dbc9e383bb9f012d3075d5ebbf039878e4ad2d8702745c8e3394f4ce033563fbbe8800f907042fb8eaa9cef0
-DIST firefox-66.0.5-et.xpi 476489 BLAKE2B 4b460364cb3c96346cde9337a0c9dadcba9ced2cda5a7180d204d3b0b41398773267490cd5f63e71293bd673a4d52d832c848a2f0e24b24b5df506436460e6b8 SHA512 bd70878b981a41aff0eb87d4cbafbfa901c04baa89554fa71668f07964467d058f361f861d3bb859f6e0fa08671c02d3663fa40a351ba7cc8d7dd615a6d934af
-DIST firefox-66.0.5-eu.xpi 484532 BLAKE2B 8590d1bc8bafdd354f0aaf44ac1e13cf543a90591bca2544bba875afe2a03674c967b2a27c6d3aa1e5be66e9ef8f37cb4b28170f656d3d504623addf186b83fd SHA512 dead7f31aa11e15cc8191d52869e6e0a427888a476a728d1fc32c724065a234bc2f4d7060ca3efb69c71105189296e7ef862d86f402e30ab3ee272da4d899fcd
-DIST firefox-66.0.5-fa.xpi 544126 BLAKE2B 1d2788afe28ad13eafa4fc460a44642ea1e332d293c6aa3c3fe20be4d7c5c86b3dd614e451d36c93c15483119f04b8e6eb7c5bf1f71dbe6f21fc001e588ff90a SHA512 e7681003cb5386def2856ad1ea726430be17ab99f25c87d58134911b8bb7370d18ab547c8b1b8f2885427c68653c117fa565677ab6f1687788b3d224e4a9154e
-DIST firefox-66.0.5-fi.xpi 475234 BLAKE2B 9ec49e77f9fcabf1312ea9b5c523143a25e0e8958912c7be42fd12969caf10132285be101362397d1d8aee1bdff715ffeed50368e566d3b42bfc95861ef5fda2 SHA512 5a6700e34586b7f2b8964c8ae6173320e300d0f836c7f7681dce8ccb24a92d7da442052305df689431b11fd6380d7ea1cce74d103cd0fb066dd6315c3c1d31f5
-DIST firefox-66.0.5-fr.xpi 501559 BLAKE2B 72031d8604565ff1ac94d5b8ca19c4ef4a826af331a6c6b069214641b95f2f6d3e0d187a7ac61c60e84669f41a9ca53185a1e8d7c3723970785d54624fa03bba SHA512 bc7551db4802a14e83e9d80ba83b2a50d23ed771d46e8fff35f912181a22481a57e9407e21f296a69092f1326f0de0448c2b00b883555b1f28234ac461823aba
-DIST firefox-66.0.5-fy-NL.xpi 491014 BLAKE2B b97f8fe8d6822b3ad75774c3d537b4f25355300e1a9406ab191c70ad88f2978dd26a98bff63f33056111acd503920db1657bf1070c0e253791cdae7a622c2dbb SHA512 83811bffba2bc6648714b689b06e6eeed1eedad6ed83ba4ed2393fdb42eeda3f18678788884ce2062129d15a28d405e1b60dc62901ec45ee35f5c4b27048c225
-DIST firefox-66.0.5-ga-IE.xpi 485185 BLAKE2B 4171676f8e498eed31c91946e9310cbc7a3df6720b22e6c71ec414e1a78365eb008779a5824c42184cad2e8400cfff9e74da9cd8689ba526da877ab11f774eb0 SHA512 44e0efd2cdccf5441074217e8efd4b59373344f3ddcc8c1f94ab407c0477f3ea27a59a2cc520becd32c729fc479febe0abdbea71df2112f63d8bfb439f79dd85
-DIST firefox-66.0.5-gd.xpi 494714 BLAKE2B 2fe80eb5daf8612d2027464b5581d78a1f220542e2b5239bb8b9dae91ae15129c04878d294181871b445a22eb73090a4be58da2eb9e4ea2e14a2baa2c198b672 SHA512 d44e4eb9770a646b1094d1b17a951bd028e1eced6e18e36f34711f4be176ce5612d8e667f41ae0a7dfdd6277ffca0caadb9f3bfcfecea741d676ffcc96db6b9f
-DIST firefox-66.0.5-gl.xpi 478927 BLAKE2B eb4348161ba77f0770a13232557c28ef0cf0615f0fe039c20542c1388831b592a3c053680eca15ad721bd67299357c859bbe9ae93521f558f1b0b0f900e89a16 SHA512 37ca82695cabb0ea1c5447ecff39b402410efb34f7199e2930c08ff92835202074ec514fbf45393f21ca0dfadfd8bcbceac968abd3f5853d7773a82c1de0f33e
-DIST firefox-66.0.5-gu-IN.xpi 566223 BLAKE2B d188938a174fffb63c3dd9af416e123ac27030ec72cf306c3b9fb57de6d5a67ca99011eb64507c1a02bd75e0400fa4c8eb209fcc563dfdf1230b68696de1806a SHA512 580bca6195f5fee944cfb7cf3018279c64bfcf77f39df4b5a914d42b62926c47482bafbe065e96fec5028003d07f01ae5d8d6d21cdc53954cd10cfe0d4cc2bc3
-DIST firefox-66.0.5-he.xpi 504758 BLAKE2B f3a0592fc8fb5a82c771a68e9c7fd8ff40510b21255dde2d78e808192e4fd4d0b61eb58837f63a594faa6f1942b6b249dc589b3ea3b2990a7a52dbca2fb1ecef SHA512 0502921d9f4f6fc8a6c3a836d18b471fda71ffce3697a5d8fc21272be3bdaa950a42bfdc0109d3bbdf59e107be95116356fb3998c33491a2aa966094e3de085e
-DIST firefox-66.0.5-hi-IN.xpi 551699 BLAKE2B 0c76757b43ffd828315e909bd5181b6de960c0224902f95f73ff2eda54cf288c892b6b2daac603fe0ed5b760311a1588944325c1a678a4c07b462a375f195f53 SHA512 3380d1bc6af2ec187ac5134a9985d7cc02c36b8089308a4a227ee4e50d8a226d19245c6f415da1b1e0b9b09a0afeb6f5c78255a01c888b0bae81db589394995e
-DIST firefox-66.0.5-hr.xpi 485256 BLAKE2B 7fbb280f39723d71fa928facc12324cec1c86b81fb99310bcc9ef8d6ca07cb9967ddc12926aba8cde2852a70bf4f068b4dce9e93850c9f27e88f6dc65c74cff5 SHA512 1c12efb96732c25cad75fa9363876280c4955ece7dc7add79dbb1a9e7222500fffec5ef8a3b836a33a48756d243a321b2883a28a43871cf7410896f99de34710
-DIST firefox-66.0.5-hsb.xpi 508440 BLAKE2B e1cf3778b564d5dae990a66d1d1ee95b4e17f5981ea7566798b28aa09d6afa5d4a9582c19fab0620df38d8c1acf946384843477a3b9563c4d33b43de8133dec1 SHA512 2a86680c5e17e36fee06a74420b64333c13a2e5733848859cd7b7ec451997d45cec515f27fff880264c6a3a63f05d7f5432a12e043130a5447677dee35e42d74
-DIST firefox-66.0.5-hu.xpi 505599 BLAKE2B 76dffee3e3485834bf5fa9fd6bd189ea607afe228e91f320ede78ca7711bed352e8269a68d03e3d0abe73a4ab213bbc665515d0f3fb11f9c2f7aee333b317536 SHA512 a95bae38c3ef2864d6a6db82350e8d42727d0b11cc31cab5737711ea0595fba4c789f39496c9b464179a0b665543cdeae9e579051d42d5e4a05b02604f9769fe
-DIST firefox-66.0.5-hy-AM.xpi 534798 BLAKE2B 54e5f1ce6b7eec05778d8f2c28eacba5eb46f40688855d644cdeabdabe6aaee15397007b722cf8271b3222b6d54bb841b2cee045bd4632f4c5e340a1de35c570 SHA512 d5cf7263e0723d2ac5c551bcaff0a7e14be396ab91d0d2c08cbc3397344645de0ce2731623d835784d32b106eb2227ed14aa65f5c25a77acf5894cb3cdd974f3
-DIST firefox-66.0.5-id.xpi 473957 BLAKE2B 12a6f7ea42ba69f8c518b5c8d32ca3143c893fa5f7e199ff103923edd8446e69a7d2cab05054544af04684cbbab30681a11c5e354860369f7c622ac0ff443600 SHA512 039189206766bee17c47e61f817e28462017d00eb7ad8bb04041010987420a5197132d6c6c3048bbc4d1c1fe8d8af5a69a0db2dd2a64a5995d545eb3540a37bb
-DIST firefox-66.0.5-is.xpi 486827 BLAKE2B 339fcb8712ed48748fc4d463f861f53edea194aa0ad4d5b6e09ff3b7427103324fb00fd4be45f01667a786a6861bc502cb729ef0523bf7cef9bdf5504716016b SHA512 5cbc61e397f76869a8edd819402ab50b584c75715629a29428da2deb2b5a49040f0f87c8e49b9845b37639b00aeb6ef74566204d831eabc83df9144b148e2a3c
-DIST firefox-66.0.5-it.xpi 373675 BLAKE2B 8b3cc5ba7e7d660bb4c68b74dc656cfc6d33b3e105aff33bfb2a2ba0a35feb1fd30de05d2450ce746299b8988268b520021e70933479c0a4b67f489706f7111d SHA512 2ff26fa2652d2f0eec90b1f6b6569e2f1ed3b2286513cdb38efbd981132febc65f4382da70ade6d8df1ab4756b3649f5ba6a3c0cffe644571ff2b9c3145e9348
-DIST firefox-66.0.5-ja.xpi 521102 BLAKE2B eb52e765bc67ae594cf5192f2eb9506827931295506abcc875de561bf20cf5b3daa7b8ab7660c9410230a99daa6587f4b0fafb00a57981a925a7bb5e3d4a0a2f SHA512 bf353531c3d883bfa39b7d5e9e578b451e2923ae7f4162c2393f375cfae3dd7a07b2411f97ec6fcdc2f806558b031c14b72a97c0c6d568f2e7d04400c5bba071
-DIST firefox-66.0.5-kk.xpi 559172 BLAKE2B 0e6e04298893ac346cd565527b77ae3f97044e8283e8d1c0bdd900c24010a8948156f9400d5f157f7b403a41d657cc2461e149b6574ecb20fd366ff92e175424 SHA512 f19325f6525bd299776437b86b91d769df0e4b762155d9d7eb46d1ed597b59a68bdb28829e5ae5fb889e803d785270f47f726ff3bd15d8fab8c4dc3290fd5daf
-DIST firefox-66.0.5-km.xpi 550710 BLAKE2B 44e9b2ecd45002202b26c306620b2bcdf9413c230963ac07642bfa00d340240e8d2126403ab265dc07ffd1169cf5104e01cdc82a4b11b496a84c4fc6aa759d8c SHA512 07a2c5995edd12c9a1fa2662befb30aee60306f78a1f043d1e476cfd792c12e44d06439b1f55eee40c2e76630c9b146784ca5906025a27391d644dd69c3884ed
-DIST firefox-66.0.5-kn.xpi 548355 BLAKE2B b5d4d802b8222be904051f4eae426947cc5f2cd4fa850542bbb716b2d8867c921478ab74aa75b569332a788f9fe88376809a0cffd70cfadb2a2735e298df002d SHA512 266e8dca59184028da04e9411dbc8a86dfb6f59b65ace3ff16749a2cb2f58f0b107563330cafe1053138b444f1a0451ad74fe6070859bf3481e36078b20e71bd
-DIST firefox-66.0.5-ko.xpi 514549 BLAKE2B ea218b1384ab2701c00dcf754b7cef86e017de72222f1a92c575dd4d56d199691675d535074845a675447df644333bc54411a442260699ee4939e3f5c6834096 SHA512 dc0c21ede7b4dc40801c789edc5c03b0b497d8ff2d8aff4dc3ee34b705fb0ad17c74f9e5ce33b4292ba0d444eb624cafab1a028bc5fb2e7a13063d0e3178bba3
-DIST firefox-66.0.5-lt.xpi 508167 BLAKE2B 57d5d0d59b8b334ab6ed63dbd6e2b0922e7392ad5dadc51f3c2062e7f92ba334e50fa233f4ca4a5a055caf9b238370d6eb9f7662467924c1c1993ba3a682daea SHA512 1210c3ceda199e915e3ed9ad523d1ee659b4ca8884337d90dab83a0be2e6f1e05477016b819f5c494ece61bee4896b5e543632b20dff5f356effb62049d5a5bb
-DIST firefox-66.0.5-lv.xpi 496626 BLAKE2B 2f0f18573d08fce52f6f21d0897c6878c01167e1c7179cb0172f6551e5ac821f1394a9adce79684e2ac99bd4ea5b91eb1364fc2378f68ba4b8cb247c1d4a625e SHA512 64fee75f79044cab0ff64e878723fdd2a4808711c7b0668c9248a389678a2b9269a55daa6a87556dfef0a65e2560baa9d75d102d303611f359933dcd06220867
-DIST firefox-66.0.5-mai.xpi 509531 BLAKE2B 378889094fc46af2e5bfdf31c94726fb7c40cbac9f41c3c3bb5d460072806d7178023954c76f810e921a4331f4c82ff3068ac83bef6cdb0e98ab0c80687e5089 SHA512 dc35baa9530e989b926663f97ea2143eacf38a28a0d4e0623f9cf4a4bd24456debb01edbe5b8ab2bb65ff31b76a9e940bff51cf9818771d9d0bb00299eea12a2
-DIST firefox-66.0.5-mk.xpi 487206 BLAKE2B fca5149c187a66e6f0c5a7d51d42669eb26bdf1839cbf1f2f0bf8460d3ef7f21a8a53043a8a41c28404e223178e9d43f38884fb3af5814d70d194a94ac0ab8dd SHA512 4d96539cabb05ba3ab9a4efbac0e2724ae18790ade9fac1dd4984e97a98f46572f74629ec96f1195e535ed1e45ed71cb11e0cc90869a6e21f08788512aab9438
-DIST firefox-66.0.5-ml.xpi 557271 BLAKE2B 838cd8b5aff2248bf01adaf81ae0357bde18551bfa037aa3f0c1cfa35dbd9c1229738c1d416d7524badb3bdc01019255775ad8b17ded04bbd07106c4fe987817 SHA512 22e2bcb5aa3fe381e28c7ddf823d2ee08457a5d13ef47bb9dd77ca4c776f3f9f30c76d7a50120b5a7541ca4ba902640ec93e4927b0513f1884da37f301358030
-DIST firefox-66.0.5-mr.xpi 547450 BLAKE2B f09e187e099d90ef417879683fce5c0180fd70cc8c09c4a4de0baa0dc27d77227292f737fd1a6cd2af36a270634b7a6ba6068cc330e5ec0ad4e881b4f3500e1a SHA512 8f9beaf209c37be2cc8b24fcae8755ca07e876cb539b4df639326329c0d4e9eef1f9f4ec73a4f2bf0a5bac08d9cbcde613eb33d0c4fabe2c043c295c10e1e5b4
-DIST firefox-66.0.5-ms.xpi 475842 BLAKE2B 1ff7e49fdf7120d88f4ac4f064dfbb903eb6f4bca12ed6a0ed8ad785a0a742246c3d0aff8838157c105776ee2ad396fa0426255b21ec8859116d1c34e616fc73 SHA512 fc331b6444b457076a345cf354d312ece0557d3c2bf285715832280a70508caddea25676d746c0bc89b9a1af2d6c3457b04681978c3dedadf214d7dae36ed3bf
-DIST firefox-66.0.5-nb-NO.xpi 478911 BLAKE2B 77941f7aefd69e969a7b1e4a7ece16fbcef3ade261282c03f30263ecdf885158e839a0a911d433df0ce6d1f5a13d3e9b6fa46ede5b7a44a85d0b68369fda0230 SHA512 639750615f6bf3a1e322b76a382702bbc4b876664093622d01d69b51a1a8b7e4b76d429cacc1ae6e8d802e58b5fc43cc4d858408d266d8825e95178d36044d4b
-DIST firefox-66.0.5-nl.xpi 471522 BLAKE2B d1a4d35718d8e05cc06a5737b3bb858601a6ed72de96f335a9955434459c06def83dac09177e54959829425e3cb8f40643c129d02785e2ff06083355a57bbf4d SHA512 be6c8e810f6d65de19142841801db8a95353a74b155a1236195502cd0c6078c6ea365a2bb753fa7478a90aa7bade5a62ceb7d537d29764f1553058f632d0d557
-DIST firefox-66.0.5-nn-NO.xpi 477938 BLAKE2B f84d1254b319160eda242931a6d1c83da25c805847bbb4cbba258ef78f851939c04f5713b40da8ebd2ff8e9cb1287e97f7f897f5f9c74868b712381819a11948 SHA512 bc2688bb3397d7e223237d77155c381d77d3fbba9914fd48d8b16e6936e91570dce4334c4e13e0d46ab3113f9ca42d8d4845ac6e168e6d40cf319e514ca7989f
-DIST firefox-66.0.5-or.xpi 498791 BLAKE2B 46b7648ffbe79f2fbe3e809a629915c6cd5d067cf8a9caf9028b1611cd75b4af57f22bd7f99c55140a6de85fedf335cac57b7a7d8712bed83d9955ad78444666 SHA512 ff723a40498a3cff3a49b131314cd09befd33b94e787ed359b8a8236693289eabe64360998c82060b35b743be46a412f6be79785dffcbe777b8c4b699a353481
-DIST firefox-66.0.5-pa-IN.xpi 534513 BLAKE2B e5980dc541ef13100f92ebf1fa787b986837e390c84e951911f1aba5821a4ce0324232860bba53d33daad7695a1b8cdccd1d498981d853ba0de77266f1f294bd SHA512 d134c69c4aa4f1b0c9e3f59db2363824d8ecbaf0d94c797dba4557db7db0b3896638e9309ed25a69707e19938d307bcb981127a6af7230eaeb78a420e11b116a
-DIST firefox-66.0.5-pl.xpi 464906 BLAKE2B fd5b6c1dc66bee6314316d3583971b2de763a71689bac64be7f8f3bae6c11b43d8a06317a1212b4ea206d72669e1521b9fab24aa48d745d7bd9a64ec9cbcb3c8 SHA512 cdc87032ac6b5d58b194783baa81c8305797d004f149b4f0c99fbd658a382e2fb4bf3b740158c468cfaabe2d4d14bc89e283d0d292b6fa137fe81c5be7a70948
-DIST firefox-66.0.5-pt-BR.xpi 480352 BLAKE2B 9f647c6a3e330a65a4bc88b97cb26b78fa1ee99b739110c453f2de048d39cce5a3cba29afdaa76411c4ed2afd1b3ecf91da3c042333c6eb301f935310691b218 SHA512 2ec75e77822dcaa37d868c8080b1c9a98761b210e30a0c8f8d2a84c5cfc43e48652b232a031918bf8a9046c23dbc27d301eb706604ecd28c0b0f57891fed8a75
-DIST firefox-66.0.5-pt-PT.xpi 490016 BLAKE2B 0694da0408f17c017397f9060bd90cf30920e6430dfb2e2cbabc9511b35f40571bffbe1cbe5f978c18f8d801bcab0043f3005f54f1997f3b5212fb22beaf9b14 SHA512 0a8afa8e4d4e812932a14a8dc91e7f394eb6004efddff4ef908ceb89d28770166070dcc67a8f8eaabff4f14ae3f2ef771a56762501c5ac2f09d99edc61458cae
-DIST firefox-66.0.5-rm.xpi 483626 BLAKE2B 74f7450b98a447ad279a8b4ef09054b69c353f6ac2aa5b27b8b7d334010c371dcf4b909ff8ac5541b0e0cec804580656cc671ae8c6ea21f47a3ad8fc8fa878d4 SHA512 213551155159c62001f58b0bc7f7456ffff91663973cbb165a587e6a40b5a60642015c64da16103d49159357247be86cb90eed9d4ac52b717ece64a6d3a87e64
-DIST firefox-66.0.5-ro.xpi 490285 BLAKE2B e2f2191530b3aac9e3a01a16e488b0c3f90418aff4fb0db0c31efe28efcc4f1cb374f553f6f695e203d5b322a1108375359f41641e02f5696015678d122a863a SHA512 bb6fce68aa819f3cdfa135604a863b3304b3a1af7879f657c47889234df1a10e7383fbcbd77f762a8ebcb6c3c4af9c9659a9824e4b2c317ade354f77720a4a37
-DIST firefox-66.0.5-ru.xpi 566560 BLAKE2B 77bc97195a0fc1cca48777924d04ab5451e9ac38c72d7cc6634dc9434595aabbfe3eea705c03475528a22269ff891a72789791ff0e31cb74fba43e16752a866b SHA512 cd46112311126eddcfd846b37d90486bf817b5e86e97afd807a9c493c9221a416564f3ce41f584a4cd3cc77a6f5fb542f0f2c53a0f4c7b8edbfadde90956d39b
-DIST firefox-66.0.5-si.xpi 527649 BLAKE2B 34b786c17aa98f6cfe3d02b7b68ea34863a5da2480650376462c7e4cf85109789fec3899d3d621859c3b23dd2fb1cecdeb8c76e59987a91010481059b43b3f9a SHA512 c7a33b4805c71f6166a3f26262df2ec91a587bcd7c823f06be5706fa93ce7a95a808b9b80927481f0833471631f73b5f1bba212469d878a38c3d8cf749a8cdca
-DIST firefox-66.0.5-sk.xpi 509711 BLAKE2B 9907c1c68e2f1bd28529301a797b9dfef759936ad3c1851fea49d443dfdf2c9de95bb5d622d526ff282ca566d94ffb06723a34294a9d8cb18521d29b926b8fcd SHA512 05526eb0fbbd5d1c43473d9fe2c80ca2c9ffc9678630f4a156afeb6c1eb520aac72eb8e1a1ffe320625af117f0e9c6fcd244080250cc28cf71a2b416c7d5d53a
-DIST firefox-66.0.5-sl.xpi 483997 BLAKE2B 664bddf04fe56d540c3430b4433c3fa184ffdb3a9b80eec9162eaf4c78e6a8bb331e3ce56b42996c46e751483829ef97702eb6ba64aed7405d18ae699a7f044a SHA512 61a2bf434b5d0ec439f6727cb6d64d03b68e4d2cf03918985dfd78c9b58aaed4ec7bb821d7ca48ddc305d443e0f1957bd735a69d95ca7d2b072afb2b0d8db99e
-DIST firefox-66.0.5-son.xpi 460554 BLAKE2B 4599329b460f698645866fcae232ad13b4377cf8f6b772d2889e53e0c6f01e93dcd44d878006cbf134bce8fc5f9b42e8c42d55f529b43dd4415dc6c5476fde3b SHA512 08908684a1aeb06e5bf7e4d597bc658aa2ce7b23e1983db1c846679401d34317c63b638257e6588e0c729ea2c67a1d141b0f577839012d731d09aa27f11e7ccc
-DIST firefox-66.0.5-sq.xpi 501569 BLAKE2B 3ed3b5014545ed6694a721306d7ebc5a135b199c8e993a3d8c6afc173e3df8c5ede0dd80b97173d012dbb2831c4a61e2269aae0ca9daff9afdf6225aaf787dcc SHA512 abff205f299675e4736106381efe7f83d8a9e343ba02da1990c0fcd7454e450f35afe4da3d3db778f9d63ca4a9b53c49abc5919f2c22ce77a7071b9bf7eff46a
-DIST firefox-66.0.5-sr.xpi 526772 BLAKE2B 1f7a61e4586d4b90f8f7aeb9d39b1b0579ef5557225efd268b9ed2f417b8108c0e050c241f8553bca03e7aed48a31d2d180d23a9db869e0d0d25e7e33c3f1c9d SHA512 db70665bccdf2138c0237e3ef3c7f5f869300b2df2f40b11f114c469e9c8f014ba16f2ceedfa27a14db1ff43373f0063109138c75c62e7e0427a746b48a06e63
-DIST firefox-66.0.5-sv-SE.xpi 488040 BLAKE2B 1bdb9313a5a88bab53701a9f3c984c9630da8b2a9094fe5be77e81cb3a4014ac4c34051adda9534388d74a8f184601e93e8b3ed560dd0b0777e54e0cd7d098ee SHA512 396c940b929d20864049a91bc556a39e1d751d6479058a4ca4b95fe96d2e65f9b11367cdb522394922f416cb2d8335ef8ac47b62fe4431f79ec9e7cd05177509
-DIST firefox-66.0.5-ta.xpi 547842 BLAKE2B d35afa4b938ebd350057554e2664b370d4b11d81dd1748578c6016961057fc01794357871045b921eb324cf01cb64ef473bfe775764220c6d2086e4d920c95ab SHA512 8c82eab0fd021dd3e9f5b9fe000d1ac6cd47b3f0d95a5e7ea2b749b6fac7b15792a33c23afd7bcca3a1afa4255797b90d05ee7701a2c6ee4556e58e0e6781e7b
-DIST firefox-66.0.5-te.xpi 554297 BLAKE2B 5079eadaad2ccd4114b435c3e08e94b27d495bbb70ff06bd384faebc76bd67669d98150463e85192b1352d3c262e66eb1e3aff9aa90908ad97b94d341eae1619 SHA512 fa7e547ae12487d9bfe9087895cdc6d2108141f9b12c768f0343b7aed90145838a3a90c08249edfbe0240207477c179032e7f2ad105c353c5dee9a01333ebfc0
-DIST firefox-66.0.5-th.xpi 532402 BLAKE2B 16575c6f8c6f65243cef295138c19d2de04c82bef1117b9d0ec9c8f35154e4e781f185a20edd7a51fccbbca3f2fdcd9c3a95d9a4a01b66ca4755ed976b301390 SHA512 aed34647e0aaf2eb81a61d30f46c24aa7be9e5add62ad18d04115d362af5affb9c08e07a74bb4ba526472db7e29c0f21c85cf3b8687499b27714c487e8cc66c1
-DIST firefox-66.0.5-tr.xpi 499248 BLAKE2B f0d983a238edad15ebd0f28eeb25e71c9f10465242fb9522f528b004dd7a8ae4a124fc948766a11ed2429101fd9118a28443f7740d3e1ba74d955672bef784fd SHA512 081b2ff3af0a78db08d103c992bcac7f849bf417d062ca7ad292fcf44495adfef58c1fe4ee2520bef756710f458d26c3502e23d396560c2882e512f1f6d67ed5
-DIST firefox-66.0.5-uk.xpi 545339 BLAKE2B 99b831fdafceb73138a1d4ec4221f52d052feaa1920de95dddf06463598c96c929c3ae63e679d81ed1e39e374f0d73b62ec5e007e476bef33452d837a7a7a6db SHA512 1cbeb98cc8d4d7fe7b8e797675f94186554d87a382589dcfc31022d9ebc86cb7d772fab11f60d35c8375929d3c60a75161d0d736dcd184d4368b9d8cc3fa77e7
-DIST firefox-66.0.5-uz.xpi 481072 BLAKE2B c4e59a9586618781a0500c7f16590012084be5822840ffc753d9c084aaa3d63a52d94360d01afdfdba8c8ee65bad01e9843aefded126aeac647c064c3a0efaa1 SHA512 f3409a1a3af54a9207eb697f0bb3130aa116a5d25184fe8ca330d26e61d76338d357f2c4d682e46e3f7fe283dd0fda296322668e68af0290eaff0951ffa11b1f
-DIST firefox-66.0.5-vi.xpi 508083 BLAKE2B bf03e4b7c4010844b06dc5535281aa57b6de5653e00cf2f507a62f1a861b8130f0cff617d389e17742e6286772243ce07466e67e083f378d674e3ebe6046537c SHA512 d695ba869b04e566c857c35fb6713e9ed54f6fafc80a1c2ce5683a81aba03d1549c2b6f555677b0317573b3873b7a40fb896b83513d2f78c4253a58ab768bb1d
-DIST firefox-66.0.5-xh.xpi 472383 BLAKE2B bf94d4ad4d1a6303d8c0cca06fe37d33ae2556de2594dde5e11ec661f4b5a362465f344f09bb04e291ecc0f103a49aa4f4c7d3b8b2ff86d5bbdf8cff80f83b32 SHA512 79128917cc13b0762b7dc21f2c6d3cb41a13ba32b5eb2eaf1b2f172210b0933955d8f6713bb95c0cef2f69716894d451c15f0acb57bba4447206053c3e2ff7ea
-DIST firefox-66.0.5-zh-CN.xpi 519059 BLAKE2B 41621b14b0142d5df23fb7dfafcf86e85b4e1a4bc4db33de01e210cde5f3c257b6c76bdf87eb46566c0456485e77d57c3a9982a6314fe890fe52f6dbfa75c4a1 SHA512 2b73ad9dfb21f29c4a94eadaac3de6ba71691c5e597093214667c580a9327d1c92b28969aca1b58f70a9213e0765db1496df3599f9c13906ba1fdc8cd1b27a2e
-DIST firefox-66.0.5-zh-TW.xpi 516709 BLAKE2B 57baacb801c95f28e7c28a746113c2b1e04d0edad3618e53249cf73380d9678520b30cfc17f04e0e4b0f18a08f523c0147ac14548df04dc565484bb09dfb5ba1 SHA512 db6e941bd100df0afe3ef4e1dcd81b96746d2aadcc63618709ce18f40416d83f096615c285a7c428e6e75d08883d87c3bd770b7e94f411aef47c7cc3545f505a
+DIST firefox-60.7.0esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
+DIST firefox-60.7.0esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
+DIST firefox-60.7.0esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
+DIST firefox-60.7.0esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
+DIST firefox-60.7.0esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
+DIST firefox-60.7.0esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
+DIST firefox-60.7.0esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
+DIST firefox-60.7.0esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
+DIST firefox-60.7.0esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
+DIST firefox-60.7.0esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
+DIST firefox-60.7.0esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
+DIST firefox-60.7.0esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
+DIST firefox-60.7.0esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
+DIST firefox-60.7.0esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
+DIST firefox-60.7.0esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
+DIST firefox-60.7.0esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
+DIST firefox-60.7.0esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
+DIST firefox-60.7.0esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
+DIST firefox-60.7.0esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
+DIST firefox-60.7.0esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
+DIST firefox-60.7.0esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
+DIST firefox-60.7.0esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
+DIST firefox-60.7.0esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
+DIST firefox-60.7.0esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
+DIST firefox-60.7.0esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
+DIST firefox-60.7.0esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
+DIST firefox-60.7.0esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
+DIST firefox-60.7.0esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
+DIST firefox-60.7.0esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
+DIST firefox-60.7.0esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
+DIST firefox-60.7.0esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
+DIST firefox-60.7.0esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
+DIST firefox-60.7.0esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
+DIST firefox-60.7.0esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
+DIST firefox-60.7.0esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
+DIST firefox-60.7.0esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
+DIST firefox-60.7.0esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
+DIST firefox-60.7.0esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
+DIST firefox-60.7.0esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
+DIST firefox-60.7.0esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
+DIST firefox-60.7.0esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
+DIST firefox-60.7.0esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
+DIST firefox-60.7.0esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
+DIST firefox-60.7.0esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
+DIST firefox-60.7.0esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
+DIST firefox-60.7.0esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
+DIST firefox-60.7.0esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
+DIST firefox-60.7.0esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
+DIST firefox-60.7.0esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
+DIST firefox-60.7.0esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
+DIST firefox-60.7.0esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
+DIST firefox-60.7.0esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
+DIST firefox-60.7.0esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
+DIST firefox-60.7.0esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
+DIST firefox-60.7.0esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
+DIST firefox-60.7.0esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
+DIST firefox-60.7.0esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
+DIST firefox-60.7.0esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
+DIST firefox-60.7.0esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
+DIST firefox-60.7.0esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
+DIST firefox-60.7.0esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
+DIST firefox-60.7.0esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
+DIST firefox-60.7.0esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
+DIST firefox-60.7.0esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
+DIST firefox-60.7.0esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
+DIST firefox-60.7.0esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
+DIST firefox-60.7.0esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
+DIST firefox-60.7.0esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
+DIST firefox-60.7.0esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
+DIST firefox-60.7.0esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
+DIST firefox-60.7.0esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
+DIST firefox-60.7.0esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
+DIST firefox-60.7.0esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
+DIST firefox-60.7.0esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
+DIST firefox-60.7.0esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
+DIST firefox-60.7.0esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
+DIST firefox-60.7.0esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
+DIST firefox-60.7.0esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
+DIST firefox-60.7.0esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
+DIST firefox-60.7.0esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
+DIST firefox-60.7.0esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
+DIST firefox-60.7.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
+DIST firefox-60.7.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
+DIST firefox-60.7.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
+DIST firefox-67.0-ach.xpi 473023 BLAKE2B 1f668745bdec6e3d67a82964b1cbb63832d6727d2180a2ac5fc64ddf841bff1b3aee257d5d8b789f5713dcedfdc179cf00018c61355e13d50e98a7d0306e2a0f SHA512 02731d08e8c4c5d202712e589b9ba746d61edcedc10ed02face7c2beb5a083a0d9c3ba4a98e730a650351c9256aa87ab20c79857ecdaa150288de4b22303483f
+DIST firefox-67.0-af.xpi 456844 BLAKE2B 5418a061dfd899a76b49fc6b95a2837217690de31523f2c30d977cc3b27eda0a06352ed9ef98860dfdbef78f815d47cddf8da5710ffa918d310eaf3a3b8a5a71 SHA512 c5873b61871864ecb7a3c8b61102e09ac216cec73d54136235a47e31d7f91fefd0958ef6b5b86838db628a73c55cccfdc258e9a6d9e441e2fc7c83af2715b648
+DIST firefox-67.0-an.xpi 486595 BLAKE2B 48f37550939beb3f11856c23909f3de50ae0d21e70cbd3224cdf59c90c87b9bc849ef91186a6ec8424f662be19156e9f68d568877eeeda4605d226b68e3c18fb SHA512 d50b8fde6413739db839364a5dcc61c3ee154e4b1b1760cde4d674306c0af383b1c5a0b2d9cc84f01e502bd6cf1c5dfb30024aa2f4ec9920ff3d95f4b07bc644
+DIST firefox-67.0-ar.xpi 541846 BLAKE2B 17851d024b0522952e2e4f9e5cd174e60df1d0ff24ba4fd2689e5fcd3b47dbc2b80001c4a3e7c49e57117b470ff659fb0cf97cc1c601bcbc8a4a4125fc73ff91 SHA512 23f99be5aeb2c295431a456e7deabfa53329bdc3f28980c5f5a73b7b259e8e7db3bb162c5e80cf14ebc91984e1af169d8a053857b85cfac10856cf59fe696a92
+DIST firefox-67.0-as.xpi 493292 BLAKE2B 60c74cfe7797fe6a5e8cc9b8197686e6a032953f488702f14e4a8db2b4fc559c4a3d52f4f6949791746b9b723f1f28cfa395ccfbcf9ea6b17e73aa552630782e SHA512 ff9bd4371b415897f2a1d29605ad83db89c32ed5f5728e27bda3e681adc062d532b9de8ac4d0348028cfb79bc4af94f9d93376add9fc316cb1b0f065f5d41e5f
+DIST firefox-67.0-ast.xpi 485528 BLAKE2B b9be81dc287312d60d88820e01ba338852386eef9f742841442444f824df78991a56c0bfac8dd16f4029377b7a8844140f988aece9c957b1e73163eee48fe097 SHA512 d5a24450086ea4152a2d9f1fc48b395ebe9806e81053d34b8b9931834c06ea2458b45892474298d718e8e52ec8481354057bebe1817c691c78ba6b9fb826865f
+DIST firefox-67.0-az.xpi 512474 BLAKE2B b2cd48d8eb9453d072cee741dbebaf4aa98a4f9e61c2e419a62d3a54d009db9cba30ce33efa0befd7ebbf5c3697003d7b3b01dc4e04ac777c2d8682300505456 SHA512 5c10d01b587e0e0c8120e5fffe7d4daf66a94be3d1c8a9f8536484cbd0ae1e40642c64247261c89193270b307eb702412c13a482271f96c08d91b4cf68f4cb77
+DIST firefox-67.0-bg.xpi 549334 BLAKE2B 2cb987061dc88cf3b9370705c0bd902f1bab2db5c2756dfc8be1587465050d3e367c2016744e004a6c41e536a64bb2e4695c567c8949fbff4e0cbc58c4520f05 SHA512 f2e90e7b1163ee50be11646990df95b2fd79c16dc6e45e9edf2d7932c246f00915722dfc7d55eadc1e0767fbf7d0d3ff538112e9e24c5179b7ee99e0f80dc696
+DIST firefox-67.0-bn-BD.xpi 567129 BLAKE2B c29707546d508948de1c35a76661526b04238760831e7eec3f6453b1019e56beb5d518216c87f1ff766ff4bb234cbeb2172d4ae8b2a9df00822c5098502987f3 SHA512 035ce4c0ca9016c2335ad1dc85c57e7fa5acd993b7afd76560166ff5d04eb03fbb856429c43ccb2b7ce7977344e840618bb30f9f5a766ae6fe746c7da87d61c9
+DIST firefox-67.0-bn-IN.xpi 556825 BLAKE2B 2111580220c83ad4600114d5c3e5bf16dbeca4d39da18c22a8900edb87f48c5575b4aec85f8b757688065b8904e4545f62b6e0f1eb24ff8272d5b7c40bec16ad SHA512 c3502e4129bddb746eec01674659b266e7f5999ac39613237ac8f02ccaef269c204a4f6ccc71680fc7f8b19d791b29d67dcf5b63596bd32db015a535e1214466
+DIST firefox-67.0-br.xpi 501331 BLAKE2B c416d76f9075fb6154fc8803d3431a58850d1764c976fb3fc6ce92d2418d08ac9bbd5e646708f80dd06d6e5164a1863b7c037368d45e7239c795923a13d0bd53 SHA512 52bea0f8c25d44bd48aba09261fc6a684cb25c02445c4a04b658ef1df79b8459ef5885654c6a627db391a5ab3f04191f9264bdc2de092f4b6a41826ad23e80c8
+DIST firefox-67.0-bs.xpi 484174 BLAKE2B 5c617d9eefd20b87993414c08a8e8bcafab9d48caa212173a573c914f7b49a7362d8bb276c147763227ff0f8cbe7cce8f3c5976151bf540c9272434f9120fe89 SHA512 bd1f5f971de35c606d9b0df0a33c8529a087b627f55a5f196a8c58214d53086257f829fba41ffd514a3392b7f8670d975e58062cb0ee72ae673b95936a341d1c
+DIST firefox-67.0-ca.xpi 496524 BLAKE2B 2aaa1d8ff42157d0656937f8333b84fa2576a2cc3b2b27a41e83f669c4121f84f654c56a84047a113b2ffa7b1f56d9d508fe9819f36b00631dde7b257a36a9a9 SHA512 6cbfa1c99dde478a0213ff6f76e9c6a7fac4b905b30ce28b7c281fc65c9ffb707cfc4892e2d4558045c707621632d66fe45b51eda4b7396dc6ebf8a98bcfbd76
+DIST firefox-67.0-cs.xpi 517489 BLAKE2B c0516cc7e24700e67f28c8de679535f78592ff625eb403e2f95fd988371f1bfbc7564ffd1ad31852569e63ad0bc05d8f01feeff4276eb8354a13da41e83b284a SHA512 79d3ddee483af8920392d3bed17ecc06b294cbc2f8eb0c03becf402acddc8e32b0a32674c72b583e0be3cf281e5d98200916c93102d43d5aa34c70eb5b12a8fa
+DIST firefox-67.0-cy.xpi 507758 BLAKE2B 00ef1d61b660ee66088e93279a3300d3530e36567f8c03e797921d2d276ea2e05884110913948954b69938ada2ab64438e589384b8732de6d16e02d880c04658 SHA512 84fa6406fc4c4fd189caa05d14825cb81750dd02a57cba1dc64a508f29472081706744a24aaa90056fc44f6ce0d436d26705ffc38a9d5f8287537107da34eb7f
+DIST firefox-67.0-da.xpi 514817 BLAKE2B 1c0f66a7e742802bf7094e5bd40900349aaf4e5dc7e442e61b3408deb5c3c63deee7b9a970df7d61c1ef5497f6ccdd50f78bc091986463a0cdcf22446b9446cf SHA512 7d92670bea6a12a0f58542b9f7ab5af0a06bcad32757774639803277d42e4a136d2a9e8b5af7634615d54cf32ba603fc544982a0b5bc3a9b18cce2f671b59c39
+DIST firefox-67.0-de.xpi 510156 BLAKE2B 6ef0ffd61093c032e3e1582978b736b805be00c7ece22b7f32fe540189d42d80fe7f0b32b8d054ae3793d2b5aff979e9764df8001554420b10f3b1b16bb61bdf SHA512 95ec3b9ed66da69b30652cf71ff42ffaa1cd9f3a063989ac086334237b4e3d93a4c171a1292741159d514496eb68b7caab69a0a8d5ce456e16b304302a3fc6f6
+DIST firefox-67.0-el.xpi 592177 BLAKE2B 0e15524f6d2bc21d26880b9d2ef74a6259b2e89f3ac173287f7b8b98219aeca4422c07ba80aa774a35e0d9892e24500b36e0124622e6a50fad1c08502bd9fa9c SHA512 aa06745c27a30df089697115e77c5ec8f3b4b9d491c45956347b33a7702a64df31e5f41578f385eb7f3c43065aa039561a7327d5b225dba74abb8b8805e3594b
+DIST firefox-67.0-en-GB.xpi 474307 BLAKE2B e1baee252fe093730673c085d5c123b507e016f1f2905b92e263dfc822f9533b8d2aacec89e2b200e1fea78b3387c1276bc09a1e261da501b6eaf99a916c31a2 SHA512 3682a667626080b5b0f44b3a793a60ebb1ff6b50a4547654632bd30c0410ddaa5f9708bf157d64888d5c8624295f2f95f347e99afc35b0491777fb6894075bc1
+DIST firefox-67.0-en-ZA.xpi 442976 BLAKE2B f799bfa41f8b03eaa2cb988b25f9ab282b17d21b01545cc7441422e97ab119e8a2bc9f070fb6f66575673c486081dd88140db83a3fe5aa7f2671206424977c7c SHA512 5ec9cdf2939bbee4d08c7a812aca3a2cab48b44fbc6c5ee39483443dcb6c68e2169381455ee03d5ee99569f920008ec8aac386556187cc9cd049055a2059bed6
+DIST firefox-67.0-eo.xpi 500805 BLAKE2B c5f85274a5e7aa8e15f44175a17bdbd5da62c7dc61f2636324cfbf5e0273a785b959f45b7cb32f991b86fdb7b5b8be47ebd250e0623898fb2b2f7d831af775c6 SHA512 555f061792fc2b15f17a663b32b6dddbb1ec578f4884f66c02d3d3e6b88bb40b90a67a2b01b1b165e07d2dc756b38bd4da276294ba7782c9b2b978d6a40e98da
+DIST firefox-67.0-es-AR.xpi 509287 BLAKE2B 5eaa509085f39777ec3eda5e672156e7721b48bef5cbd8440e49c190507b594fb3bc24674d32a1f1c3ea5c9f595b0cb5918447299bdb39c56735f310faccfd53 SHA512 3c3bce37416752c92f436b5e09c33583b6eacdfc93396d8fe6805bf2876e6ebf9e8227eb2e1b187a38439f06cc6d4578f07ed64978f7bca05fba6e6d821d7a49
+DIST firefox-67.0-es-CL.xpi 508067 BLAKE2B b2e6c19910dfbcfff4e64b1447813198397469c43dfcec4d7ddb2fab800a4ce5772f819544eaf2fbbb233722906c62e4c75a8f8ecc05b4484914375fa681b2ef SHA512 dccf2832144f1995e470c01adc2dcd94b073dea5784258946074aa5835b027d99f6790a1259287c4e825c2fbb2709d0d4d2b552583e0f04567c73d57ea3ab420
+DIST firefox-67.0-es-ES.xpi 479115 BLAKE2B ea5a7f0b6437be573c5280a07765eb524e0416449e6c6603f39e0b90421e44c250e92339cb1c945d4c87027d31b22f7e97aed3fd1e907f1c99f546b6a7f124a4 SHA512 15cca69e099bc209b6ebaea8adc2d02bdb7b67b494b681356b5982c976be8583f639a486107779b41f111cb6bfd58f61590780627a4d4c730bd123d289d6375d
+DIST firefox-67.0-es-MX.xpi 507050 BLAKE2B ea1b7e60dff1ea21ca7c1360a538bd35230033b0c75e6149adfc56efbb43535f5a2c33f8af8151a9f75aae26a9b16318c62d54a5cfe50db3e54a84c82899d8e8 SHA512 07cacd6795a711c00a4ff11481e66c767fd2bdbb988789256780de4b8a3844a5ad3a7f4f39f56e40a7f89688e2472abfd23d9ec98be33ff2657babb2c472ab28
+DIST firefox-67.0-et.xpi 483622 BLAKE2B ea611e55406db52e0397cac44a3e1f7235604379eabeb238c10303bf92a1c11eb77aead6078fd82d6202f604d3c45dfa9ebc917359c0788be90ba52e01dd2c81 SHA512 a4c007fc12753709dd9c9ba339a1a2db064e89c0333b5b86be8371054141dcaa0d0f9e30ecbaa8ef321aa6e41d2a75ac19be7f637318cec2f8d153bc32399454
+DIST firefox-67.0-eu.xpi 497739 BLAKE2B 5be0ae120589879b79e0dd82db0b070e69b469c2a2e2af42e4fe8d42bde67f62ec79a0feb3a28830338850f0f8e438d49b85a0606d356028518a85e2de56d499 SHA512 f65c70af331ed820715f68c9d2b0e8e9d5db0b38fb46d92b1819ed8f6ae5ecad40e1cdcb7b4f0458ad138273a1ae04a61dc1fc95bce04fa5a25f301b13e60b42
+DIST firefox-67.0-fa.xpi 552219 BLAKE2B b1449b035fadf58027302acfc8fc59046b102c58880d8b8310801e9da0176390c263e3db8eb8e809511b3e83018985b65a6ccbdf83ddfe21275cf4227c7f6f3e SHA512 bd3e550920e12284ab62115e014e6f4879c453f457bf3d53ca3424243f4db0d11cb02052de82ecb5302aab7aa18dca5045d13ad1df1adcdf55e7bd4743fcd1c3
+DIST firefox-67.0-fi.xpi 490362 BLAKE2B 9f0db7f260ef8df7d7fd56c1810d06006a7815b91cfd28db315b5235c3339816a958e731ee01b5aa2dada0e3dc45a502de1fcbc7043eebd36d26040d808d5f69 SHA512 d6a7288c77b355bc527c16fd4ad13b2fbcae630d7379df3c62a0ef388af566b96f8b02e8d0c8102cc3f889edd4dc57c629cbf0557303f32382dc188ea7988a23
+DIST firefox-67.0-fr.xpi 520005 BLAKE2B 9afc36a8c7f1190042e34b56646983f887e2109d7ae59b343983c99be9859af3661072e11e661ab2633298bfdb1a7690378a40680d54353315926946d28be5c6 SHA512 08503ed4218e92b58f4e14242de17f281f97ab82f4c43730a39817c1cb6979b8f695a68d6b02d8114c291513b5e7029f73e63fce9df947af826bf88627b20b5d
+DIST firefox-67.0-fy-NL.xpi 506201 BLAKE2B 55e895fc2819eedf9840a499786c2c03a6262f87e486bb8c00f31cadb3e2cfebc3d4203525be554ca392bc41f6886da1bbb4c58b66f2aec2918ddd9a97aa4f05 SHA512 4d8c4247cde6eb0ad35d3ce260ea6e1b35c3f4b7e0efd2000d3f558bb1048186e4c204be4bfcc76d1c278b953a5a51606715767e6422d693a0a22dd4a3f9083d
+DIST firefox-67.0-ga-IE.xpi 489162 BLAKE2B 8b7fa7c901bc8801109c1e152c4632a3448834de5a54ba4f7a91d929f2900f5121deeb65af906c21ee5a334ae18884c2d341bf976d1b65a27a4b4014120df079 SHA512 97dfb9579ade379a1b8b5d36a61dbb343dc1239a3c84bf8bcfd743c9e46cc9b37de1b8f039fb7d82c84df4b7e6f1a9ed4f32854cf04d07cb598fc6ae860a674b
+DIST firefox-67.0-gd.xpi 511069 BLAKE2B 42cab5bd6b7a8456ccdf87cc9c6eb394247d1ef2a66262f9f5ec393ef020b3c6f7abaaaa8e300054d950c595bd8dbf730fa2ad96e4ebbe0b1929e424a6a3155e SHA512 13d5f050308877ff080c528da2a710001d556f381d001a5ba3640e50eea6718cbef4fa90fde84a2cfc195589b260ca199f1962897b478261f0c2abe5814de414
+DIST firefox-67.0-gl.xpi 485875 BLAKE2B 57e3c23e19ba8a8a7850451f8501089c10ffae8814187aae1de90dab368659c3b5080f5e8a9eb912a0cc1592da8c721ffd7cd59c651fa9c1a21a69739f5143c8 SHA512 bbcfdb77a1a516d97bbc7a739106f40f297057ebb109d1d27b317c991eb3f7dd1fa74db00e82f5becf8490061c06d4467ed2f821479b44ef47a6ea0df6e822d3
+DIST firefox-67.0-gu-IN.xpi 574594 BLAKE2B 4325203fb1f86a3225fa373856211a2dfc00391ce541df3c6188bc3adaeecf8e06e065a360600c94d55bdca9ce92eafe54344dd4f94cdb5afe5f89af448c58d3 SHA512 aeb77a9438ef8bf6c7cd144fdfd0b3a7eef39d3c625618b3b13ee1df4ee443e9c923799ae866f181435ee2f19e6f2f09a34122f77282a08e88a2e4311d17021c
+DIST firefox-67.0-he.xpi 514592 BLAKE2B f17a76df9c708c85567bd6950d43ff89bba3d99e9ae8f8bd8c78bd159e82c105d8ecdc6cb2e91b481340d26054952f9165072f90fa6c8ec9c7ccf0a0fd379bd5 SHA512 623f9bafc1290ea699fd99dc5f405faf597f5adce6754d36c44c0095296004deb93d95fe8d889c30e7250fb88a9aa4039ccab3ee91ae37479a51f7666869593e
+DIST firefox-67.0-hi-IN.xpi 559704 BLAKE2B 3e01626b7fd65c05425f8cdd977b63f1b235cffa08be64f735301c5c1dc849762e9a51b8dc6d42e6060bbee6d4717c4b60df803d8576ecc3ad651387fd35e0dc SHA512 2c6c9397fdf1bd7b4150a16581a30104b9bc2ed25eeb8e0363595a26042eef0797a98b297d1e21f331711fa7b2b0f1a8fb450afc2c5c0022d5885d37d1bf8d4c
+DIST firefox-67.0-hr.xpi 492453 BLAKE2B 5bc4e0e520888ad6f43878d26441bd47d222011a78a7ac35fb48066d006efd9724f96b56423a9c6237e86d61280d5520328c19e7728c63cee083d361e9009f01 SHA512 12a8b269ce60eabee4d2e8e66273d627d73569a9ba290aa14dbf4507906961a58a3b0de256dbe1d667aed117ae32fb8c071d7c6380b9ffafb068a004255df96d
+DIST firefox-67.0-hsb.xpi 523953 BLAKE2B 24520bb99b4681e5700420f8ef51797b59da719a71d86b00995e2924f70232f07f6164dc851654070757d9018c70992ff004d1750c8ac8b332658f877ab95739 SHA512 e2893a73a3c107fd73943e225f67da4acbb742e5bd434cbcea1582ee56ce2f9e5b6d3c3cc81ec6abc41213098f9f4416694a317ba7fcffbab02f1332bc222d5b
+DIST firefox-67.0-hu.xpi 525574 BLAKE2B 1a72a7d82506ed11814b8c5210bfef430e22803e9ce0b5551ebdf7122864b9d1e32603836e7f44c7d70567109c3b21ab19390f617ab57cc85bf494e3257880b0 SHA512 bf0f5608b76926ffb8759a09e1a8ab80ae5eb86c69c68bf7ff02fc3e6565cc93e8405eeb7ab5c464488fb0de319781b3cfeed6f887e21ca7c6c9f42eb501d790
+DIST firefox-67.0-hy-AM.xpi 546320 BLAKE2B df46d20eca94185c7f5af70b3a3e479dea8e1410fd7180cebebe76fd4febd1bfa82a3a443856a62f869ccfdd75a9e8be7f101e1378bcb7d861fbaf8f775883c9 SHA512 1614010511f07d691a5f3c551c94ccbd61348a5a66205b22fb592fbb1dc13b0731a1115d59d0bfc15df59aaee8d9261c71c315a63cc5c0634a4882651b87697c
+DIST firefox-67.0-id.xpi 491017 BLAKE2B c8f276c4715a56d0c658e7bbcdb7754353e80bac70d1d106266ca88d537e47df92d3888bd5637caf4c078e39a22a308e2dc478bd2178c2e1e35af22e2f0a1f6f SHA512 f227339c95aa37c3280218c370c6e777269f308310221d2a1d11cf8506949669747956d5a102876a9da431e3174b9148a4597697e9e697f760bbc793c40f0211
+DIST firefox-67.0-is.xpi 496689 BLAKE2B 72bc9a145c5e31521e672ecff03b4e07b6ee9a318dab675e9e78d6676b7c578b25db4a04f2a3097775dc89b45985b462a16681319c58385af3de678322a4d8e2 SHA512 3bff12e1ab0bc05ff14afe6aef54ec6cad6160347d1fc5c17eb85dcd7c58c235122618554ac9d8dc827f1d2a1d7782f077ad925b9778f9f340d08a6a1210e1c9
+DIST firefox-67.0-it.xpi 389210 BLAKE2B c964e384380bfc402bbdb51215ba35558b237eb8a1fdbb5359c8ea84b806b551e2e8d946b01a702e1d8be63248009a807bb52208d90159581b7deb5db3709cf7 SHA512 ea44ae4a3f3b4dbc373e1eb1daa9d65408f5be4daa63385edc661e0b0ae7ca539bf3fad675ad4d7eb499a35ae2b9098358a60743b6f1d53d90e794a5ffa46ba5
+DIST firefox-67.0-ja.xpi 533884 BLAKE2B 998adbae64e3902a8624223257a92c6921406d05d22c1e9cde528a49ed3f4b9664eff0445874764beabe5acf0c948cdbab293e8f5dfe4b0a830b5d65acece02f SHA512 308ece21ae09fcba6059c47903f87961b5772f848ad10aded397acf3123748b38efc86654a511ae5cef3ed7f4acce82b06cce32293fc44de3413744ce01112b6
+DIST firefox-67.0-kk.xpi 574829 BLAKE2B 1519b2f0db46de46209c15799ae7136eb602a5acca6e70a06c705c539f85124abf84ea2540de89d974a9315d12860af3a12b61fe57d43e6927320a00ac3f126f SHA512 a8b8e8e540efb091b6e03a140e27d1f258f500bc26f772f4f9ce132eb7be3c5f6bbd0e3e4b8954c368c96025f6e52fbd1d6df4a4cce98acc5147bb70ec547bfa
+DIST firefox-67.0-km.xpi 557304 BLAKE2B aa677b9cb669be7e6f33c6a41d8cc290934a5d47f7863d1a62d1371daf5d3b69e50d91f08b09f5e2fddd234980cc55fd58e09193e6a971b970828aa49a83e29e SHA512 e6b27b1dcdf9c30a5f73cd454cd2af13ad43f2cdc352b9f4a6767f2aa5799321e741acc11e62acd0a6668b8352e2436b7d5e3bcdaf2427ffc5872fd6717f9dc2
+DIST firefox-67.0-kn.xpi 552972 BLAKE2B 30f0346bcd4202baf5ba6e5ebf6b3ab6b3315402f2d94ec48f5dc67ede9b58b6978b29f0c6bf4e2e3c889fc78787441dfbc2ee0600f4f633aa465b7847992d8f SHA512 e34522d962551999033c9c5978badc3f63e741cc052a297f7d0948bef00b221fdc5582fd1affc570f7a4dfbb099e8c63d928153fcbf82fa095e6e2def7cb4c64
+DIST firefox-67.0-ko.xpi 535116 BLAKE2B abaa7914f05bb9a6ce6e4ee450b5f001e54a87b55006e5ba839758e2b03e30ff7406ec1b09dd1d87716e06a0590cb6ae26b6bd2541946cb8148189f6b99d1141 SHA512 ddbecd2361b2f8589e1e0b2c5fd74973a24e8894eaf348ae3e8571a0d3160663e7ea7d94660db155e1c579f887624e9f052b654f462191cb1b8ab92e93d226e2
+DIST firefox-67.0-lt.xpi 523549 BLAKE2B 6c8104d43cdf9a5ebbec543749b2cd842e43168b589f823ee77b50ccb073d37e75c6dcb29271755ffb645edfeb2e37fa81681282a3b55357a18c3750cc72a100 SHA512 4956a32e68871a81ae13494c48bebf322e636d61c8fb92ec65d30c91ced9036e2908aec22a40aaadaf5343233a3712362e93d31c67825f7e745e2104477af110
+DIST firefox-67.0-lv.xpi 503313 BLAKE2B f009f6a2f81bc770e9924262c68cf57e0bb8e117449eb8ae1e2d1813be668a1df4082bbb2c6878356dbbb9dbfaeb10a69aa47afa4ea6b232bb833eef1153c976 SHA512 cecaedb404cd75bb1f2f7e7768cb9aa360b4649e06fb725dd1f65eb5404ba0033a35bff5bfb479edb065552801bfa01094a0e83c093f7f04fd52db1f3a05922f
+DIST firefox-67.0-mai.xpi 511904 BLAKE2B 369fe67f38400c65e3bde3549c3c8e03a562025f8d0e3a5bb69ab373dfb7f2b94f32926b9a9b9039940f7c1f04e60e99174be8a1b6e1847daec20b45b38c1114 SHA512 b5a19f474b6d91d278e49d6188db2d001a52333548983a309034fc89c608d6e57aae39b1cfae332207242da209cf5b423db12805d6fed53bb7f3820cfd3803dd
+DIST firefox-67.0-mk.xpi 486617 BLAKE2B 52a0e773c68de7eeb36854e439d6cda709ca5ff99fd62fa0e96d3edc666f467b5cb82e9c5975e5d9ec31051945094d11dcbc3df5ccd3ae82b7d9c4e5b9b03481 SHA512 81d5515a7d0a2c0b1fb331f69133c014703bbef70fa6e0634acf33c7bc2fa1e4e64b3e698e026fa98c1c7b3b982a297e4c2009568e7007d9cff29f0c6ff6b80e
+DIST firefox-67.0-ml.xpi 574481 BLAKE2B 5492e9ad2cd7dccb61e9f9e7613642c80a20ff8f2bfdd6ad4fa5e7d69a5b4d0ec8f1eca3792ff56a18d0eb52e9a10d1fe3cfb1953f999c715ae23cda49e1b2ab SHA512 199e3d6559a958b6d911892f43b0bbe3cbb8dbe59f45d18484b9ce239b512ef73fc66c969dfa809465b4d07ee433aed2e692b3b8d509632885be9aa6e22842af
+DIST firefox-67.0-mr.xpi 559662 BLAKE2B d3e79ad5ba3098b9216a8ac23213a33cb328896ccce183f24ce719483608ec01d0f374a43442b2cd6cbda0fe1a9aa5aeb92553957338f0025ef17f388ad66a6b SHA512 4741f84b95746fb562105be996cbf07933be463cf388ba827ee9cd17bb7f65fb92a5657827f0c3e01135514056b26ad183d56ac284d4ed0ff6be0f3bbac9eefa
+DIST firefox-67.0-ms.xpi 482414 BLAKE2B ff2c68b4ad78573316e954bf813bf36f3010754c5f440084d6f3fc5316bd8d798a1f42a75f59576d5e06fb056bdf9bbafbabb19b580f5c83c84fcf35f2638493 SHA512 c6fbfbadca9375b7b5f9dad2fd6f92acef245d1ec266d359a43badf364053c4e2a9130f60346dcbacdd77db60ef7d9e5cf98db09c8e7c09ea43204b974cd5be7
+DIST firefox-67.0-nb-NO.xpi 492535 BLAKE2B c34a7c266ac1a9292c477cf27bcbfbdec4ac8c13eca4a54aa6c04bc015d550d92e2e27fe8e02b5f3ab94cedc15bd881c8e5a7fdf4421150aab2173783e2a2156 SHA512 cb924e39b92e8fd29056d943c85dc3af6b4a5d96c930a28bd56b6039b295dd4cbde3e70a80d700b421071031c6d09ee61923e228fff3c540da8fa9f51b71ea08
+DIST firefox-67.0-nl.xpi 489396 BLAKE2B bc55b85740ae1d47cafd31dc38bdef4d16aca1a62a3582eabfef6971164c9585b41d12d3d13e1438f9688a1bc130a543bd2320b61d4fe7ee1498d74002f5b2de SHA512 c60bf47a9adddd549e545a6ca9b9b78e531360fb8ace4dcf9511ea676efc41ec485d2f01065dc3b9ad17ed719a69edcf7692a7acd7678926ccc103be8a957df9
+DIST firefox-67.0-nn-NO.xpi 493980 BLAKE2B 37e268dfda7c694a773d168a4f215e7dc663499624c9161335ca49d40a1c3d382df2624f1d37cc5eb49c397824caee2c10602afa3ac7370003d06b9c2b179c7e SHA512 d2242d23045fa695ada82b9a3d3fc392338f6f3fa1c72829be7fe4f2730d236f85e82afa0fe9bf7fedf312b3320f1418ea02ebbd363e272c493065346247e84f
+DIST firefox-67.0-or.xpi 499781 BLAKE2B 8487af9fdc16346d3a54fc7dce9d6799c5b9f64c6b4b3cf8c327863d3da20d7af2fb8226e97bbe9e1ff2fe0032cff59a51b1d03062ae8fa67437dd4c1ba7eb51 SHA512 5a31d8f533d127b7b6e650c84d0c61e90a00666c59dca209f16902e67e1c725efcdeef452af7190d0f32d46289c56deaf69f6510ad2e961a3f1bfe24b34e0ed2
+DIST firefox-67.0-pa-IN.xpi 546156 BLAKE2B 56819972bd7f0fe887411fb238c8ca1b914a688ff6e806003065149e6015a08b5b045d0d16419a5fdf9d0ee34c9e9969d6bf351f4d83ee84b0489e547aa29814 SHA512 f7c2d5ff779be660274d52edc88f9fadf728fa8fc950a7f7616dd596a6d7c95e278ee8520f775e001616f57333abc0def8025e574db41c2ce5513000fe1cfdfc
+DIST firefox-67.0-pl.xpi 485692 BLAKE2B f229542dcf7194d498fd82961cc324cf5567c227c8e84a3d2fb470267dd3cdddf020ae1d218b1bd15bddd6684a69173dbdbe04e7a3bb600a0def09f6d6739f5b SHA512 6d462008138331f73b0d20773406db36b9bbf9e4fa56b48faa7e0519a24ce77f55d0b494ea46df7f1bf2497f66197860266469b873ea572fe70c2143dc8abcc7
+DIST firefox-67.0-pt-BR.xpi 499903 BLAKE2B cfc05f2bbdec1a70296c7c969b0fb4196504c88e0f4ab5acfa4c2a610baa2a1f45567a5e4dcc9af2c60cf1962305d5f68062784e0e6896e2f416cce07eb23277 SHA512 ca5ae9e6364beef7e52e3edd4d52a06842b55806c8eff69a4f8580cbe4419379142c9e7f02a8dfe15e4f94ba5736e2e8dbd6b48a4c2d8f61b754e21a68fc4e44
+DIST firefox-67.0-pt-PT.xpi 509660 BLAKE2B 3e59c495ad86d016b0e89b5f2c0e8e6435c6110f982e969305c78911b69b10ea695ca27645f088bb62383e6ee0d04ac04847fadd5d141350b356c5ee243d365e SHA512 d43d576d208b6e9e92a1f6de19b5d407a4350c5f43a6d4dd2eadd2bad512ec468f308204fc76f60e5021db6a3cdb8a4406b2af4ef0d4324fc8964a07ff62d0b6
+DIST firefox-67.0-rm.xpi 499055 BLAKE2B 67425251d2066cd5cbe5dc17c253b602b1f04cee9e39cd1b3f78cd3a4110e9d094d8445d57d76a811bc1e434ee0e56b9e8e0b0ae7ee7332e66f83496d922d7b2 SHA512 7297109c7e8e50f2611031d0f66907c66c436d7fe45ceded35c70dc5682e7d32055faaa648e0d05e6f43c790858dfe653676e25ba74166e2632295e90504df16
+DIST firefox-67.0-ro.xpi 505667 BLAKE2B 47852844f1e66dbcd34638040f66b253b937591f6f435a2528b04122ca34bdb98377336b222f8ef15b4e99481830dd4ea3075942175f291715fd663ce761bd63 SHA512 35746a3b7605ea93f0c1bf1916cc2a0701a843da31f2ec90c78e1975a92aef7c910119b64eb0af4a2eba9f06ca6a43572ca65eb248f6362973de1104cc7d052a
+DIST firefox-67.0-ru.xpi 579654 BLAKE2B a988adf8d269e9b1ee30253e817adfc574920ea84f71d583f75bd95f09c58a68c2f557c55d6d411d178c628bb94b27feaf891222676309c2dbeb4836ce9bab5f SHA512 e6cc4bdff6590d8952834d20d560faac142d6f189d7d7af3e28a2755375147f2b847b1b9ec864c88972c10eaf33d643bb6b5d140b007335408349c43ba44dbaa
+DIST firefox-67.0-si.xpi 532085 BLAKE2B bcc89dbdd567299388734b88e7538189b0dfbdd0e5c768965f0d42ab98b978c726b2b0cc6bc00dfdde0a3c6cfec8fd7b866c9059c9df4e43aed1b590878e9ece SHA512 b30e5d645ce4e5ea38d207f118e5f1a89c8fc75a62d46c929927455daabfcd38f3cea9272c7fdb63457d955211fdbdfbeb7528309637fcddb1faaf5b001d53fc
+DIST firefox-67.0-sk.xpi 524995 BLAKE2B 6a709943e07ee03dc4c8d319c82010c825ea39d260f3dc48094fab36029d6a3c1b6d2531071ef36539894bad5bafeee2ce238492c24acdc6ab19b35d6be5bf1c SHA512 c7ed56944c6523f86dc71926def9a76d4f308f9ac1f824302dde7c55491e0a742f2192d7b667a2db05520921c0cb7e1a585b4ddbafabb8c9e56d6e33f310d78a
+DIST firefox-67.0-sl.xpi 499860 BLAKE2B 5de7b058bad9aab6bfb7b217da0506599a28c18bf9cf633ad3f080eaeb049614937c9199348119c9ccdda9c6d36fd3bfae3f99e416fdd44a4e5380576ae6e02b SHA512 9b3c40b4f79348f266375bbbdb5f15e721ff733692df89edd38b76755d83dfd54bf10a1b451d466b31c905bae84352ea65937897bc9210292dc27538c26bd905
+DIST firefox-67.0-son.xpi 463856 BLAKE2B 3ea9f4a8db31a3897d8e4a2d3ba9e90b935316339d862df4fddc042cf9dda68af15c7a1570cd403c4f2e513eaa261e1ab5b27208bf0e40a6b464b8ef8a47dc20 SHA512 6370ebbc741437e1d94fae911783812a0bc1121b1030edb1d391d39c43d31a72fb6acaabcb3b3b9f9d9a5e72cb3d10e7cb6a114059b41d7d137781a864e6c81c
+DIST firefox-67.0-sq.xpi 517474 BLAKE2B 195cbeda28fdbb2db5aedc8c79c0e65ba8c32cd763a235109e94685f9d26857786448d19d6525cd7e3b30c7f3aad77a45c9aa8b976396c3ca0d36d826d2e406b SHA512 515a2a605e7cea18a979a396d3bc5a72662e34dbeb7afbcd29d7b961df04d3a9c2493b8dfe87c24431670094e7b40c390430eb73ad42998e16e22ab99ec3f53f
+DIST firefox-67.0-sr.xpi 531347 BLAKE2B 61485100fb612e76c0f2c0dc905d9250b592c5c9b8c63ffe3d495a6decbc9a22344a34fe200415253b8387f30c9417130b86daada5223322230b33634926c433 SHA512 ea7e181eaced1f4e76f565ddde75852000691b490996d143c0032d36e56e228e624c2104eb9ea131d998e1bd588f7ea016a18325a66686e03a76c87271571f76
+DIST firefox-67.0-sv-SE.xpi 507857 BLAKE2B b2997ed85af9c2458436dfbaeac855cff9b10ea4473b9e68e592ad9c98d154548a705bb372c122e4c8c8c42cbeaf3e870800ab0376b658b0d486d633576d0896 SHA512 6931ef1c1749ce2fd24c7f70ec22b56d81a69a6e66656ec712247a3f0aefd70b2ab2284ec324c5ffd65d0e8a99da67f0c92e1355a06bd7da3752a16b84e31a66
+DIST firefox-67.0-ta.xpi 553749 BLAKE2B bf8c1c0546c4dd43fc1283eb6eac02fdeaf59c80cd30e785043702466590bc7cbfe578d464997271bc8ced599fb94cf583e3e22c56e3541fbfada6394b344db2 SHA512 fdceec3c0b0616298f1670b1f9351014a1b19f8caffec7393678b6b2cc23a12f38e8b67954a1632953710d1858332f58c4e4bd075ce95600a2e46b186c765291
+DIST firefox-67.0-te.xpi 564806 BLAKE2B c452b0a4cc1e92b5aaee6baa27cc20f6f95b29df0b4eb401f3c3f5c5510fe91a7d78fb9357f8f867fbccfcda6ab649de81634ba7b585fce316babc1ddeebc1f1 SHA512 501a12d430360fe98e2d0fc5e0f5c0b26696307825269746732a16c3251221af7eca04eca1214d69bcf23a9a7bf381693ac5263cb02ca3c25767a65b7a207858
+DIST firefox-67.0-th.xpi 548934 BLAKE2B 7b48976fe8b211562618f1599595fb57dc8656b0e1046f86d308d3715cfbbeb0e7be6fe4f6fea2d26e3f291418956d41766d3527597af49e763eaaf6eeb62ad1 SHA512 706a060ce3db7ed2e1f0bc5a8893026e70e236bf2cbbf93191377ffcb9d98f45c1c46df0c8826e07741f134e65410ec0c12484c6b8ceed7674638382aa3d4ce4
+DIST firefox-67.0-tr.xpi 514316 BLAKE2B 40b4a97fee1ec6112848b60c06b1491e4096f3c7b89033fb492d6cd14122529b6b2667434f1b9890c85067eb909d61b2e66526989d6f15374847fbebd880f16a SHA512 b61c958847ec9c032c5958a6bca77a16c33dcf0fd637595611780cba501e1153e1a09100f14fbc40e2ce76bfb95889d986a471f8603cbf69e2c0a706734a254e
+DIST firefox-67.0-uk.xpi 563844 BLAKE2B 356fe586be4124679e9da75c05af1ef7f202244131c63b93f77d39dc9490161e86af4a4b0b17cfafeef5e1380f14bc1cbe631f18110f7130173994c580f201d2 SHA512 285198ff3a42ca701f7806470730e5df02aea3f3141a219e418c27678f7e15605eb7f53a4650535ac638d734850ccc7bfb955536fafae4352f9fa3d4901ad5bf
+DIST firefox-67.0-uz.xpi 486671 BLAKE2B 5484f2f7f4b544e2c66977b8d3dda61e903233856f90448e7399cc611add5865433dde48d9b40987537cde38c0e2d8cf1d73b2aef77672e9ba67dd0ac0e391f9 SHA512 5910b32454aad61798612042eed18e59c38130ac04407f6bd2e24504e89eb9666ef0c0eb36e3aa5588d6f0d85bd9efadb38991269df1ff73e44ffbcf54b4cd44
+DIST firefox-67.0-vi.xpi 530343 BLAKE2B 57465db64e1408ca15eb5581e6c97779e9b0d390c6054af6b8054535d212248e4866321fa5b06cb224f5bf7060b3e4233dd5f91e775340bf7d8f17498336261a SHA512 db4a56d4b1301eb3c29a54cd5e369c995a21e45acf82f81314b858fe3ac39a5b9b2f80dbee6ac60afeff90ac5416ab90da912be15c315bb326eb52b34c1c25a2
+DIST firefox-67.0-xh.xpi 475483 BLAKE2B 77532caef41c358188e4fb6a584c3afff316e25e74b20f50ea503781493b086c25d7f581a7696853b2ba8c3fd052c4bcd9f1c575e7465d1cc7aa4e41503a8478 SHA512 008a712ef2bf670ed1970da6d7a2a605d426e43b45217f1fa683a9dc07f3e6f4c6483f8f74a0d07a4ea0ffbb1b6fec23ec9018808f253e21fab92f0abcea9b8a
+DIST firefox-67.0-zh-CN.xpi 537479 BLAKE2B 4947f23b125fd2fa5bcdbcd48400590d2e35fc1c2e7301e8db7df2725b9d8c8e3b89189c7f9b1443b2f07833a4bd4fd5fab3ecbe242c1c44e2f4cecdea382b0a SHA512 4fd7572f7327a891b4c68726bd35cb5c844c3863bab45df9e804a38a7eb4699367f0be59cf07f833d1ffa808f8022986f240b84648ecea9cb0b6eab8a16131ae
+DIST firefox-67.0-zh-TW.xpi 537618 BLAKE2B e62b4689f5f4329efa57c45309115d380057b29238f254e623c6a58adba87142b2f874096750f3cd678325046dea91396f15be488b389b00d80786ec2c206cf0 SHA512 28b2dfe48d7642bfd5509f95da1e0adb034b137789f513068089e290d5e74fd3c4e53ea3d61f884680a2ef577eadcd4d9f16720917ed93a3f417eff3a6eb5313
 DIST firefox-bin_i686-52.9.0.tar.bz2 58598632 BLAKE2B b9cde89261bcaa57841d2ff5e440c2fd86ce0011a1a6c4c6292abe51f2d479324a5e6c9f6a6a135c2811975ca850656cb35d922a169ea2604f3c13aa5aee4856 SHA512 f0f6b494eed4f84eb013065ed1a586efb03b50441023fea866306fbb65de3e7ebe5ff572575d868c17e3ca11958d90b1d6a8cffda0babfa8432e4bd3f19eda15
-DIST firefox-bin_i686-60.6.2.tar.bz2 55618299 BLAKE2B 33a5bedf1c6fa95df6b99b811cfef681f3f0a9b72c14f9c6a70fd38d2df3a09dc0c3b0ddfeea6c09d4c580b11158b0db793231de1a7ca92937d525e3ea01c5c3 SHA512 b2027c2ec9ab21a69d5ff08afa9cfa30e5abe56646e2a1837256e367cfe081d85ae21687a8661cab5c34b8f7e8d2efa633d91eccf2924dc050ef128d1b7555cc
-DIST firefox-bin_i686-66.0.5.tar.bz2 63861310 BLAKE2B 6befb2631ca26c4cfb5bd101161401872b1623935cb89f4923e85bb3c6498cb9645601dc0f417f00d21185a89e6bbd9ba4b2632fd2d4db899ef4515f00f07ff5 SHA512 0c0579498ec84c12e2c90ca98c79021e888de449d031ca4e27c7b969934fb5d63b997153947b4121eed7046fd42f264865d6a3cf40b4543fe3a2f7880fb0ef4d
+DIST firefox-bin_i686-60.7.0.tar.bz2 55792020 BLAKE2B 36fba111142de041ac3f6aa2bb98217bcbba48ef231e71b7120777096a89fd251a6d5227e27bc97689503437c8845ce14bbfae366db4479707307b8939eb01da SHA512 20bb72aee4230eaca4c728b52af881c7e1cced7b93b6b465599e03471a4c4d2fbc7f59af1ff28e9cdd5288380858c4f9511c7968f55fe91ec61fd7218e7ae0fd
+DIST firefox-bin_i686-67.0.tar.bz2 64506092 BLAKE2B 9dc45bb462d7d6a009d81a3ca7ca4909ebd22bbb149c77dcb4b4c506015786f9e7adc6b1c80c69be2ddcd0a549dd08e2af716078ccb98d4816c5ddf7d2d2523c SHA512 ae8ea89613f36febe3d0fdae8267cb38a60a2c08927633e96d5e8f7d223043caa5e96bcf2f832c03c0c183b94043f7025659cee158e424aa0f0d9614638afbf2
 DIST firefox-bin_x86_64-52.9.0.tar.bz2 57795546 BLAKE2B d767749ed07a0d54da8acf0273c59d9a4d7f46491aab34b7995ce76fe43366c06b859dd2ea1d8566861e1086e73aa30df28ff4d9dd634c1948868fad7643ce6a SHA512 b5d7da00766354e72f5a48f4f2143623428256d79d0b3e958ed6764b680afdf2b3188c61b09a02dd1537c8b8d3ddd1a1b828b1cc13a16df02a52538a42c62954
-DIST firefox-bin_x86_64-60.6.2.tar.bz2 53336263 BLAKE2B c967c95c8e73b72c1d0fd50add763e97fde43e20c0e39a8ad55a1e3c43d94e7535430f2251134f9730c11cb5cde3f1658e1c0a51817e1eecfcd1254eb8c1fd0d SHA512 9151d5b331ec6f7cfc475e8aedc69167ba03be896440b39397c02a37d34d76b1f5524b9332e812981c49ba44de89adf9b33ce2b4dfa21f6da98c0bf28a216b32
-DIST firefox-bin_x86_64-66.0.5.tar.bz2 62099150 BLAKE2B e156c1717b569411a1975e2d6946f45071c546071472e11b08d9ef4eca5655e37afd0ad217551daee1ba8cd70f045197d2ea63ef698cc59e29db52f15d2f3185 SHA512 7cbb43a8c1ffe1884c551421bc32f8e48239200af62800e8ff5b18d461b1ddd7b5d0c9afe0e262f98112bbde2949fedc740209e957bcee0b2c30a19e17bd5428
+DIST firefox-bin_x86_64-60.7.0.tar.bz2 53552838 BLAKE2B a545534dde7a5a936182825e0898ee0c973871ad4d8370d8365d90f1fa655928aa192e700d00809ce3bd78704b1f37d777b9710c8e0a9c5799f13e42361965a1 SHA512 710af24a5676fec480fd37d198c0c77c5cc33d450b8cde2c5d2c27b5bca54a64893c0d872314cecf2657868121b8dfcb9127243495fddea8fa1333efcbda1858
+DIST firefox-bin_x86_64-67.0.tar.bz2 62649703 BLAKE2B 068fbc3f4d0125619b7296fcc7518697ad22db077f1c95bf5f7bd22e4700f0eef6bea53fab5361bd1b19d56e1fb00770209337e88ce107d633fec75407c49d86 SHA512 fa6572a1dddc8b0563250e0ceffe4df3394aafe2995a82b9055900695c28c3069bd9afd8e55fa710f7f8f046524c0fa92cbc61478154cffc6e23aae8b3ee4e06
diff --git a/www-client/firefox-bin/firefox-bin-60.6.2.ebuild b/www-client/firefox-bin/firefox-bin-60.7.0.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-60.6.2.ebuild
rename to www-client/firefox-bin/firefox-bin-60.7.0.ebuild
diff --git a/www-client/firefox-bin/firefox-bin-66.0.5.ebuild b/www-client/firefox-bin/firefox-bin-67.0.ebuild
similarity index 100%
rename from www-client/firefox-bin/firefox-bin-66.0.5.ebuild
rename to www-client/firefox-bin/firefox-bin-67.0.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 40082e9673f1..9cb6ec6c5c62 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -92,98 +92,98 @@ DIST firefox-52.9.0esr-zh-CN.xpi 461679 BLAKE2B 745b2cfb86e93a379e13fa73b7e3721b
 DIST firefox-52.9.0esr-zh-TW.xpi 453068 BLAKE2B 84e08ea4fd119db1f1c6f84b212fbbb5d6999c5ac6010c0e7836d8734726d281107f3d91ba7bac1aeaf855dc36d3b018ae3913dccdbe2b11aad02a8d8aaa893c SHA512 a99042ef7d00820e341dfcf2c45a8b5bd77eaf2cc8ecf0ff5ee982b7bd9beac7cb4bf051c57ef3b7a5d9b67cd35858dca396d21e65718e248f3b1fdba5273999
 DIST firefox-52.9.0esr.source.tar.xz 214087304 BLAKE2B eba5305ae3fc9a4306cbcbcd8d4610272ca5b75e369367961e9d94919b003de8aae8f3c58fe1c628787d98105a85fab575ae2b051e92a0b35bbb8b402c100766 SHA512 bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
 DIST firefox-60.6-patches-07.tar.xz 37404 BLAKE2B 5516ff768bee0253131381fdba3e08785ab31bb29e44ad7f7e2956fb7624fafc9bf22f892ddbd0617e5e7d18500686a9975a60ea77d23a2853f35936cd142030 SHA512 3c4160e632155b0a239e22d0c1b1c701545b0f6d0915f9bdcf3b8431cee1abf650191ffafc5c3224a61279c8b1b52a80444c811a3914e16127411991c963292b
-DIST firefox-60.6.2esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
-DIST firefox-60.6.2esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
-DIST firefox-60.6.2esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
-DIST firefox-60.6.2esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
-DIST firefox-60.6.2esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
-DIST firefox-60.6.2esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
-DIST firefox-60.6.2esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
-DIST firefox-60.6.2esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
-DIST firefox-60.6.2esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
-DIST firefox-60.6.2esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
-DIST firefox-60.6.2esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
-DIST firefox-60.6.2esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
-DIST firefox-60.6.2esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
-DIST firefox-60.6.2esr-cak.xpi 552250 BLAKE2B 9acf359b7548db8112164775a34d7e6067b3322b541caeaecc3b35623f8984c7701a5b0684c228f7428be1fcbbb24008db52dab649cb9816a4030bca5f168505 SHA512 a251c7c4530c32881e7eb55766bc355784c1e9a996b5c478ccf58bb41d263273ca26f262b39b52977a877e83a64086cbeca3a19ffb1916366db562d97552dfca
-DIST firefox-60.6.2esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
-DIST firefox-60.6.2esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
-DIST firefox-60.6.2esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
-DIST firefox-60.6.2esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
-DIST firefox-60.6.2esr-dsb.xpi 555476 BLAKE2B abf9024f9ff8720f9de22620c818864d6c019a33b9067704bed380f5f53b5c9a5e1db7ede5d3359da5d8cba9f3043c828df546a87cabe001f2a735b40f09f9b5 SHA512 79e3560e0997b36bee0b8539b5906115ba0e5acea9af874e6fd623d255b9d2ef4c76214365b12f54f1640e60d6137c57e54dd14d6d8898aae064488b791186f9
-DIST firefox-60.6.2esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
-DIST firefox-60.6.2esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
-DIST firefox-60.6.2esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
-DIST firefox-60.6.2esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
-DIST firefox-60.6.2esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
-DIST firefox-60.6.2esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
-DIST firefox-60.6.2esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
-DIST firefox-60.6.2esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
-DIST firefox-60.6.2esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
-DIST firefox-60.6.2esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
-DIST firefox-60.6.2esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
-DIST firefox-60.6.2esr-ff.xpi 527929 BLAKE2B 8156345c34b0726898244f81c8c3f0ecd63dbc873c627790c6100408c0bcf62f8ef602ce359cc54014e986f0444e83b844268079de885158260e7d1b9132711d SHA512 2651980824353a804fb82e85ba267dbb5694fefddf87ed4b226acc9a156702a628b1210a801e0c9cc8da3714751ab9f0908f1e75314e1f5ed0b3bf49e27cbbb7
-DIST firefox-60.6.2esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
-DIST firefox-60.6.2esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
-DIST firefox-60.6.2esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
-DIST firefox-60.6.2esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
-DIST firefox-60.6.2esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
-DIST firefox-60.6.2esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
-DIST firefox-60.6.2esr-gn.xpi 548926 BLAKE2B cbd8e30bbe4624199dff5d4f11249ae779dfc90e98b56020e95ac12515c2e18417771ba603a06d754248dba3c520afcdeb66095db27ecbaaf717e12dde605b29 SHA512 a71fec710e75f09ff56836af9772145586f2c8af3b2b41347291204926be20966d0ddaf97a84fbef60e8d084bbc0fdae2852df8539f5456011cf00d4e937666d
-DIST firefox-60.6.2esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
-DIST firefox-60.6.2esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
-DIST firefox-60.6.2esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
-DIST firefox-60.6.2esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
-DIST firefox-60.6.2esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
-DIST firefox-60.6.2esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
-DIST firefox-60.6.2esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
-DIST firefox-60.6.2esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
-DIST firefox-60.6.2esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
-DIST firefox-60.6.2esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
-DIST firefox-60.6.2esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
-DIST firefox-60.6.2esr-ka.xpi 572565 BLAKE2B eaf19540797a1a9a0b7953ce04089bbf302acbe62dc18c5577bd3c9781db2e986b4919cd22ae572c1e16ab29f3a381036dd121c2f32df12726bddcf209d59ef0 SHA512 442c83ffdcff0e3ebf5c6f3f842f7e4076789335aa77edec2d366161c28e7d11e7badd905fd65591b67cc49bbe2f6006a23a8a6ea0c46ed0d6192311d8750d25
-DIST firefox-60.6.2esr-kab.xpi 536341 BLAKE2B 97678f57033f7e5a2e8d578a93d51a76367ff5622f4924334c1421f232fb768139c270743d93e09ece0b570ac37d2660a7e3362bafaa54fdf007d8793f7a51e1 SHA512 19602cadfd53a0d70a5a198eb8c3a44d3cebe3eb4b474ec43550e9df9765b10cecdd2cc97e500d82bdcbcd603ed5e6db1acec1ce70c01aa11dc57b4435e62f3a
-DIST firefox-60.6.2esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
-DIST firefox-60.6.2esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
-DIST firefox-60.6.2esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
-DIST firefox-60.6.2esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
-DIST firefox-60.6.2esr-lij.xpi 529124 BLAKE2B 0d8c37a97d29a48ebe5d94173b2a0cdc436d89c41ee1d047400e540e149331d766b09d8bff23c47019b7ecdbcef347583d4819f7e61ce02dd118879c41e4892e SHA512 5702298ce9056c37d350d96f82d56ac0cde36c4301b05ca111bb66b0b76e1be04382054228fdb7059a6380b4924d949dd2706177efd04a7c96418c69db306ca3
-DIST firefox-60.6.2esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
-DIST firefox-60.6.2esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
-DIST firefox-60.6.2esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
-DIST firefox-60.6.2esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
-DIST firefox-60.6.2esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
-DIST firefox-60.6.2esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
-DIST firefox-60.6.2esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
-DIST firefox-60.6.2esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
-DIST firefox-60.6.2esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
-DIST firefox-60.6.2esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
-DIST firefox-60.6.2esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
-DIST firefox-60.6.2esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
-DIST firefox-60.6.2esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
-DIST firefox-60.6.2esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
-DIST firefox-60.6.2esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
-DIST firefox-60.6.2esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
-DIST firefox-60.6.2esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
-DIST firefox-60.6.2esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
-DIST firefox-60.6.2esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
-DIST firefox-60.6.2esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
-DIST firefox-60.6.2esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
-DIST firefox-60.6.2esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
-DIST firefox-60.6.2esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
-DIST firefox-60.6.2esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
-DIST firefox-60.6.2esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
-DIST firefox-60.6.2esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
-DIST firefox-60.6.2esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
-DIST firefox-60.6.2esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
-DIST firefox-60.6.2esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
-DIST firefox-60.6.2esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
-DIST firefox-60.6.2esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
-DIST firefox-60.6.2esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
-DIST firefox-60.6.2esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
-DIST firefox-60.6.2esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
-DIST firefox-60.6.2esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
-DIST firefox-60.6.2esr.source.tar.xz 271234924 BLAKE2B 5c1c17472f79016cfe15cf74776b3ca5c0ab9df2d8a0cfd6acc09970ceeccf8b44d33de6a4cd7762089a2bf72a21eb8bf99c171e468a73ad0f09930320dd17d5 SHA512 ed4bf61555dcdae953b0a2f7bc23fae581b1c205d401e1bec524f62044455774c5cb18566bc2c96a6465bfd0d2b504fa94fbc719c4a46ea80eec2b776e86309f
+DIST firefox-60.7.0esr-ach.xpi 512788 BLAKE2B 155c72980b4a0573f2d4e2d80f1bfce095bc2aedb6ab265b2fd4aa35046c0a91ee64a8f00dcea957a7889133e8969efdb49c76dcd67f7a8a0e6b4532aeebab0d SHA512 59980e52d51095a6dfff48044fc2a1fd8c237f251dc1dc681eb0f799700e1b4d08c10862a34a77a41a6d5b90cd96ac6271af6ad63c0d6be815c0e687d6218ccf
+DIST firefox-60.7.0esr-af.xpi 503031 BLAKE2B 74cd2d6169cc455fdff7a93d8327388f8247375bc362b5f0efbbf3f2fef80a05f73c3d761a09b427057e8de81da3b8b4bd2a551d4f1b627a4639bf3117f252f7 SHA512 5187dbbd3e025ab7523377f262e02a7ff9a83091b657ea7f22da85de78a71a1f839af05a6ec38aaa2b1c38254b9cd3b95e1ba69dd1ffd6d71919c63e8b3dd469
+DIST firefox-60.7.0esr-an.xpi 536226 BLAKE2B f110e39d28d98c916b2b74b05c634f87a8ccb52b41c87931eb2449301d723af9b2703be411e2ae9506138bd0f9193da315d511c207d9030efb7bf926a627c1c2 SHA512 524e75c7e186aeffb29360fb6044d334d37e0e0495259bc6b12b43c44566a26159cc04b715174ad836086e4950e0f012ea118aeed33d8cca99a25b2a8872c7a3
+DIST firefox-60.7.0esr-ar.xpi 563542 BLAKE2B 448a7a88254bc27922d30f9a6c4657c8d2f6581baa3bf976a73cfab1fcecf919de7b77544ec83a128c622d11815c26cbcd2f56196245aff1bc316308b14cfad0 SHA512 33ee7cee0b06ec8930dae61e5b3e48c4c1e51fafbb127f756e88809f8ea83d97f6fcc154d78d26cb944230d0a80c6b3f6a695300d81aa2cd8f0c8fc226606e9c
+DIST firefox-60.7.0esr-as.xpi 546437 BLAKE2B 7be219893258f1ecb3ccc27b85a79d968b6ea35986fb74a5b23a9e711de1aa23057d2a49dc9d163c619607b188b37f1094f31920bde603a3c6dc615ee1194bde SHA512 84081960df0e6fca213bb86af690d7935834ccbef6cd3ed2b8aed220755651a7b081c37e3570cece78658e199a31215c988849f46224030bf21c54f5c083bb3a
+DIST firefox-60.7.0esr-ast.xpi 524607 BLAKE2B e6b78e54119a02a8b58927ca8cfd4030d9b099326750622675c27224c469a3e0b1f4c5614f1eb1e066e09373d073a1721ea3680d1ac0e1a1fadb98d8fb7c0255 SHA512 9c5d8697abdb12bf7562880d02d52bb7329f9ff715718835b600ef8138f1201612fcd2726fc24b11dd27561d74134527d1d4bff0fc8c7ee7ac4e238a6e185d35
+DIST firefox-60.7.0esr-az.xpi 540469 BLAKE2B 608a0c8883df8d6aa553497a3189cab73abac231df19bca142628160c63cf750c6d92b0934ecc75833f00fa41914d198e5d27ffeb589503af721b3727938ab33 SHA512 72cd3b8071d9e5a2984d688283e431eff677b5f41dc0a77cdbaabc8a259e3e5a1ebbe734cb4a0c1e6038c8fce8adcd6d9f244122acc049dbe84f5ecccbb2e2f2
+DIST firefox-60.7.0esr-bg.xpi 589576 BLAKE2B 458375e0c2ad6fd280fc1e548cbcf22f6b5bfb47fd93598cb630742c6ff4d9ed1dc0963344329b9817503a7af57ca5eff582624db4635850b7125455e10bcd65 SHA512 ac2c273edd8d1367e5b17b89bd8edf993831bce9623db1ff3e3047bdf784a4c0aa27262786f7af03c9f292d36cc2c4bbca9b33c2421f6ef4a4bef945c843f887
+DIST firefox-60.7.0esr-bn-BD.xpi 606817 BLAKE2B 04699643a433dd6a266feb07f9ff4f6f7335e46af808a36512fd85389ad7a17ac4016022c51c0fba6f9bf0b855dab0e4c6d1be0e9f6045f2eed81b39453a396b SHA512 351d674efd9acf3c68f8c2f96c7325338f402a49c3239b709056592bb43840c8c9f0fcf302cbc9c9881d21e55e2552d0cec72996ec278404e13162047f9b815e
+DIST firefox-60.7.0esr-bn-IN.xpi 587255 BLAKE2B b2f7b13ceae7f7b119c3f358008ab2b4d17e1473fd1eb445a99a201a2a4759c6c52d444571d9279455bfaa3466b30ad5ce5087a7fe7645b0d11b25acab3df901 SHA512 90d0056ac6ad76d7389b777c69d89fc6d413b4b5a543e57b1ef8dc1a5e1e327a919fa23d9052a277410b1da788150d892897a7951ab02cf39b11d293386a83b3
+DIST firefox-60.7.0esr-br.xpi 527757 BLAKE2B 440a43a28ea01159d924e72ef99254cc442b624e603927bac9d7d75541a8bf1317bc61dc56873f44bb00d8ed81b77b74a33fabc32a7ba24dfef024155c959cb6 SHA512 9930acc0cfc501aa4059bee95c56990427b018c72b1bf5de86971fc027007c53baafb5efe7363279b7db6a1bceb0b4692e5d259c133b67f6956ad2cb4dc91d61
+DIST firefox-60.7.0esr-bs.xpi 530426 BLAKE2B a8127345707989cf78c01dd32afcc18817f81675089d0ddedeb8a6da49e45b0520a1986fe0fc742c70b6e0f5aeedbbf74935819972e86789f1507ee08c4ac37c SHA512 6cea1f3eba3f9b75f46c4d215c72c55742bc17020503c8c4a721ab9e7ae1b4b36112f3b099ebd5cd7a57308e6761521ad5d09e7a5c80cf92b23ea3255fd66fd9
+DIST firefox-60.7.0esr-ca.xpi 540990 BLAKE2B 97fc19cb1634787f54792e085e7768f41082d6427e80be42df8f9d9d16ca74c7f50694a4bcc65029c8d2143c6eaf44de93f967028ddea2bd811fada91b9e5835 SHA512 02497c871fd333a4a4e2e4f454e7a2312f218999a5ad8c14bacfa9541ca1d3b25dc0c21d01b706808374cc2989e3f02053bd95a86f113a2c1d8e0a63be32de1d
+DIST firefox-60.7.0esr-cak.xpi 552250 BLAKE2B 9acf359b7548db8112164775a34d7e6067b3322b541caeaecc3b35623f8984c7701a5b0684c228f7428be1fcbbb24008db52dab649cb9816a4030bca5f168505 SHA512 a251c7c4530c32881e7eb55766bc355784c1e9a996b5c478ccf58bb41d263273ca26f262b39b52977a877e83a64086cbeca3a19ffb1916366db562d97552dfca
+DIST firefox-60.7.0esr-cs.xpi 547514 BLAKE2B 116daaf11b03c97413cf35147a4982e30ebb07e9a3d56c7fcd87014c857aebba00979e567819d4decd51545df42f7a3c6fdb3049f3db450f17ab3786a3f304e8 SHA512 e3d657edd0bc79b753eee96d07957bf1fe21ad94a22bb477cc485026b2f4fa3e5b92da1ded42cb07aa1af7533ffe79eef02b08f3ad3c15a8e74eb2d8ad320507
+DIST firefox-60.7.0esr-cy.xpi 532366 BLAKE2B d705f0eb9ceac90c0f4f80bd1fefde31ef8d13a3d38b3612f8a8037bd3f8ed970fa2817e2c14d125336edbb304f197816f658028c09d58a1de1c46a94a7dafee SHA512 5cd44136c1137f6c01065cf409b415435d65e7e80822d1e8f44d98cb8d498836bee64bdbd4ae66fe7bf474e18db23997ec42ac644099bf7065cb6d2d9c0be5b3
+DIST firefox-60.7.0esr-da.xpi 526479 BLAKE2B 09c754d309d62a46761c30392304585932bbf335870379e8a2fa60dd291decfe0f7cfcacc8ee543ecdfe989730d716639e37fe2845a77bb2ea7b77eedab99e99 SHA512 9e98b7daa7d9e661b3cb5710f0d85714bf66fa7bd23cd8d8bc35bcf1cf96b995889c44ab291e2f4dd25a96f0e60fe75ffa64cc8ae1dd6231de9daa90629ae922
+DIST firefox-60.7.0esr-de.xpi 542253 BLAKE2B 02b2b4dc7292b5b19c1d63bf15d4546c83dc32560fc31d60cc7809dbd250b95cb891381ccc1c15c366d06a5fb745dc54bb22a88be5fbd06889155767ad61abba SHA512 5225415f90d32a535eedd2d3d1a730d9c0552f82b1b3ea57c8f50ea8b48dc36cb34eca9da4d404c0cc13434b1717bed200188488754e2fb2e176021aef9b8c98
+DIST firefox-60.7.0esr-dsb.xpi 555476 BLAKE2B abf9024f9ff8720f9de22620c818864d6c019a33b9067704bed380f5f53b5c9a5e1db7ede5d3359da5d8cba9f3043c828df546a87cabe001f2a735b40f09f9b5 SHA512 79e3560e0997b36bee0b8539b5906115ba0e5acea9af874e6fd623d255b9d2ef4c76214365b12f54f1640e60d6137c57e54dd14d6d8898aae064488b791186f9
+DIST firefox-60.7.0esr-el.xpi 609423 BLAKE2B 4790d546c71cc62cb459b40d93617f6dbfd0d6e8e00358767095ab887bd76ad98caaa10432bc6513cf4101924d4ec486a08e82941db414389259df26b1054d4d SHA512 9581691d4d9a908894eba849f7773c2d4d1bc6616f55e56ff848a90205a10c2b33c5e72f455d71ed85d55b8b6fbadea5e9f6b564807264b8eb056a3b3d483335
+DIST firefox-60.7.0esr-en-GB.xpi 508089 BLAKE2B c4e6436d8e718f677a7b0f15dbf85d61da10317cd16445f5211c4eab64729cb6ac41d7c5fd3aa48d6668fe0de0b7e9c1b8b018c20cb7d0f4b01cd8b7656d7854 SHA512 79e9ae89868271b5de7fde1c1ea0932fa1d2c027e62c9c92a7ac9213b900ca29d3232db8ae66cbf9fa3bfc5923b014b132b24800aabc0fc33a55461e2cb1b3a5
+DIST firefox-60.7.0esr-en-ZA.xpi 491066 BLAKE2B 3699ffec61649dab2f145b669e08e5b4b67af31436a5983364112f491b09925c21b01c8988298de6dca9e06472a2b3fb469129c3c9bf53f03343ad392629401a SHA512 6f38cb6b0a9a866272cd5f5a063ac4d5c2c8f7246fd4bac33d71ea828bc4ecfadd430abc3ca39c598fd3769a0d9335486d16fc5e2b658e15b7d4b2e6816c45da
+DIST firefox-60.7.0esr-eo.xpi 526982 BLAKE2B f1f808c0aa431242ebc655dba8a03c032a05bb89062010e5e0c003f84d95568ec6d5829caecd22f5a6514d316dd2d609b65b8855bdcf6fdb3c6ce0e3f4a34a54 SHA512 67d06a9bb60890ff5cb99274be77bebddeee2554bfa37b3aa3fbd8be9c22e77285e07d4a37b095891a1194e69cc8b52dc736821b8af856f7fdb273a51bfadc0e
+DIST firefox-60.7.0esr-es-AR.xpi 541043 BLAKE2B b38b6f5fbe1aa7a6d8b72287ea561755f18b672ca9a3c9b805713b350965bd59cab9ed6150e737d7ba493302560f1bbafaec8975133fe46e0622b966ae84cbe9 SHA512 7189c7122ba3721ad1980f5cebef9c0585c107628ac384b41f61faacefbaedf782edb8a387bc40814842051239ab9990d39200b71c3a03a29198cece0e084e06
+DIST firefox-60.7.0esr-es-CL.xpi 543730 BLAKE2B e1ebf2449ffdec2d48e48b63a5e88434f182266d419fc580b4cf9520737ef87d7076ebe1b95eb62b8d1abd1283516b20050230884f750a8554e4a0d81d7b8565 SHA512 cee9756d7925352a4e47a88d0ad5d5550ea362ec1e79c964692894f52e542a3122857d3e13e5e3025ea0f39329a75af0389d6d9820b68d984a3045ec33727060
+DIST firefox-60.7.0esr-es-ES.xpi 476369 BLAKE2B cd3734640c19707e2a825efbfb472339bb79ebc93cc6c0b549bb9da0b673d9b579ea7b024a181124d3736819e49c20d799a4b336ded2482a6bf2eac3ecc071ed SHA512 85930a7a73c0fae9cf527a661ea0d3883a9bda1aa7b89e0d1325e04e58e7644a3597e2d4e52a6947df17178f12094cb9272727cdecb20506aebadc4bf80cccd5
+DIST firefox-60.7.0esr-es-MX.xpi 545044 BLAKE2B 55a1d88dc31186bbf4900837991aa1ed053a1c6a551135eb4eb8b40fd66f10ce8664ca334fcfa9d17741247fe98b7a75052f65f05e48037f2cce8ee32b986c64 SHA512 142aab032ede44234b7e447d53cf1c8304db22303638272912412c9ec01b5c52dcce6d20f6a70b1dd751b2e5d7e015c626c14829a9d224d8b4010a6865e19ba7
+DIST firefox-60.7.0esr-et.xpi 520689 BLAKE2B 1b743a6c3e658db5abe850d8697905c8010ffccaab572378259af7e0af1a0708f676bbfe5e5401b53ef382e19eec805d2904a1a6414180db8111814033257f59 SHA512 42a4d6e3852b1263342966b6b8b7126758b68c40d94609431092c0c06872b53c4c45f96d1e85f47cab71d07692b3fcbf8d16d002e49e3dd6acb95b9dff19cb19
+DIST firefox-60.7.0esr-eu.xpi 527432 BLAKE2B d3d66b2a139c9b148172e7bdaddc207e3491c4ec7deed6997558d6bf323416f6c3d809d5dc5c571ce07cf59e5d8b00d6e4e5846b824f1cb7541c57a0c93ba422 SHA512 c2d7840505922e8bc5c6efe2ee1d231b21dd7f951956f86af8c773c9187fc879e4286841672a903bf16d02236cb827f9f59578f598cc4ec39ac325731874bf1f
+DIST firefox-60.7.0esr-fa.xpi 581993 BLAKE2B 8c50faaa1f3797819efb16158c893d1e87ab0aa0da7ed99f8fa82f0647d57881d00e8503954ffebe697214a433febc89f83755bea856c633880498c8f7b18600 SHA512 c31e94c95b8a5b4b03a914c33903fde817f194156dec87cdcd59ed59438cc69eca957be93e3afa581a117f720f41c12525da5931d0ce11aead672421efc8ce70
+DIST firefox-60.7.0esr-ff.xpi 527929 BLAKE2B 8156345c34b0726898244f81c8c3f0ecd63dbc873c627790c6100408c0bcf62f8ef602ce359cc54014e986f0444e83b844268079de885158260e7d1b9132711d SHA512 2651980824353a804fb82e85ba267dbb5694fefddf87ed4b226acc9a156702a628b1210a801e0c9cc8da3714751ab9f0908f1e75314e1f5ed0b3bf49e27cbbb7
+DIST firefox-60.7.0esr-fi.xpi 521913 BLAKE2B a7a861650e375eebf594707e71a0a7b89db557aea415ddf4adf1b4364732905d14192a335c27d4ab4b3136da81912ca3a63795070b47cfe97b2b6e0ce370e055 SHA512 b11944da43e696ff11762a49224a40b60071c60f9c9c8c3cf80551b1d5186fdc323de345572610feab425099971813ac4b83ef0a16dcc7c9812bb8f0b2d91b1d
+DIST firefox-60.7.0esr-fr.xpi 551796 BLAKE2B 7e8775feba42625917d9382166f8079f41e83b7618a10c9e485a89ecc9fb70c2f819a67a167900c2fcd93f99553417fe1c10822602c2753b55c479b7cf6fe6e9 SHA512 41e0cdc0391c565e6a73211f46a427556ab69672b8d954c9610a08ce8d33d10d33f1999907a6df8a017dc610a173586b234397a2ac9e75e896be66368a24b287
+DIST firefox-60.7.0esr-fy-NL.xpi 540915 BLAKE2B b4554df17db9178c0f28d32e37c28a60243c75fe6a2e6b4374f4408f2a32e29db55297735187e2c26e680123ce1209de47abe1e37503266a729d59621a2e17a4 SHA512 71bf9bade61badd4a907895b8cb98e1c0a581230c8e872880dcfd2a56aa8d72c270af3298f19161247b3c22c956339312564987d32d54e57abf7e90e7ed210dc
+DIST firefox-60.7.0esr-ga-IE.xpi 543377 BLAKE2B 74e8115a4f31c47e302d5434ab3c273ae4ef5627f2e8f6904504b69cdb824b88292abcb6302494350ccfc4272b0b0ae0d074a31bb217acc10e10af9dbfdbb18c SHA512 69c26b3e346529a36289a6b215f44d0f8ecce7fa38020092bddb61c5fd4407ab19bb052d817ba1b33cf365ed3a9574e0f1a87bdc8985b2d8b610fbfcf101312a
+DIST firefox-60.7.0esr-gd.xpi 536588 BLAKE2B aaf7ba835faa933483fa85edb74e8f909907e84fa8a27facebfaa811d661d29a073006fcaf39d00993ce2b402db2b2dcbe903e3906e6e003fbcedc8052b77032 SHA512 259a786faccff9749e8acef61d5fe9bd569c954e23176d0be224dcb627313db35ded5cb92e7a791c440af701b9ef1364cf9f35d3598def57b2ef1e0cd410de04
+DIST firefox-60.7.0esr-gl.xpi 513086 BLAKE2B 68a2848c828b2d655eb229e97f475dbc705b78a09e2edeedb2ed184a3294f42f91baefd6d1a64562a140b74b8cc0b8f34686046f0614b0d07f29163110cb1b17 SHA512 cc8ae70c8adaab02801664bf2c601fac6a23204542c3333e38fb6e70dc8cec2015840edfd1d0a70226a5834379a84fd299cf2dfc92854c3c2ca6d283f3ce47c5
+DIST firefox-60.7.0esr-gn.xpi 548926 BLAKE2B cbd8e30bbe4624199dff5d4f11249ae779dfc90e98b56020e95ac12515c2e18417771ba603a06d754248dba3c520afcdeb66095db27ecbaaf717e12dde605b29 SHA512 a71fec710e75f09ff56836af9772145586f2c8af3b2b41347291204926be20966d0ddaf97a84fbef60e8d084bbc0fdae2852df8539f5456011cf00d4e937666d
+DIST firefox-60.7.0esr-gu-IN.xpi 606672 BLAKE2B c345d34ca6cf60a9142be6aff771e44b6e93722f0e3f466d1c8d1baff85fe3455be51eb38334c31aac38b97592dcab97f1b3b09e855eced7864ad32cf8046ad0 SHA512 9b09a3d944fe9a6d130c3f41c4f9eb18d5829aa9e5d64645f85b8e443159c219e484dfdd317b87983e6d455a6e755c280aafd66fb4fd30d2b0edc82f3dd93fe5
+DIST firefox-60.7.0esr-he.xpi 551703 BLAKE2B 367d5eafe2080b7945e2565ac0c902d8480744b62c96ed72da1e1c2ea76fded6d70bc272ce2c96b73c72f044ebef14fd8f1e557e8d2f274d599b0c8da0a272a0 SHA512 2b333273a72724ce9f19c82d7b77930736061400c2aabcca1ca8851f51a71189d3f05369fb4688c59217ec682ccb885342880ceff002b4c4927afaeb52129c87
+DIST firefox-60.7.0esr-hi-IN.xpi 607256 BLAKE2B d8b0aceebce03d37c34e04fdb3e30f5b99de4c11cd80ff04742d69c3eb4a92674980f58e360d0ff56f72467a1ad836bf94b0a7d4d30ca33f6ce0b9faafa275a0 SHA512 1d0392531fdd19c5b02f4407638e4c7596bf81289465db0f6a9f117c3e044c62538ab65ced2fcc2ec2c38c83f3b96e35370c9c3da20be295a7f266575814ece5
+DIST firefox-60.7.0esr-hr.xpi 531679 BLAKE2B 98fb68376a62a51bb0b83517cceb91f6bfb64328b6715b09c37e5cd49224d7225c5708ce602b343e5404257e76ebce44986840c55b4cb29f8077ecd9741659f0 SHA512 e952b4c7ed8044c79323e33f3874df8568669fd250996eeba182df4d682e29ae338fb52acb2171bbd6836fd915fd3b59ae1f32e549306be46e06ba575e140402
+DIST firefox-60.7.0esr-hsb.xpi 553014 BLAKE2B e3726efd8b755c1ecc11647db683099c44463102cba544eb206c031c79912a92d2c9ca027d3de72bec35286700de508e5907e1a469c2fd945e3665dab22fe735 SHA512 4057926b10b54ea4b72b1ff09bcf3ecc14b30c4b416d7724540214263050f3d2250fd75dc740fd5c149a1f036d94f6a27b3d076d28373b52f7699305981355d9
+DIST firefox-60.7.0esr-hu.xpi 554135 BLAKE2B 5ea31669cc91d27983b7421316e4eea26bb7b54bb60ec0c8d34d01650b11ad0f78928afb0945d782450ff0e79a901724dbf776e68dd685111f3f61a32ee1a52a SHA512 9e82fc5b8cd81f64ef219f5e33fd334c6f311552c01c2c2cf6955e64a4491f683c42ec6e2afbc81bdb63293daf2915e8ed9c5e213978b95f16933180948704a4
+DIST firefox-60.7.0esr-hy-AM.xpi 585821 BLAKE2B 160a189beb3fa92a264e2926d05dc0ccde4da1672c134c5d10d1b41073b7fe3edd2511a96d86b8aab81ac39ba7ee624632919d117e870fefaee65ce928043961 SHA512 1b44f49d124558ef94b67ca3917f810b73ec4f56dafd949a7de94941741e7c15bd27e00a97e9714a75520124910a47647e6a4a341afef828966d48612dac9c84
+DIST firefox-60.7.0esr-id.xpi 517939 BLAKE2B 3cda186f2b0e6f401820b93420aa28cd66e1d654ec71e047eebca1ba85531b42f11badd5b5dfb9b368760f293e6874e1db896e2415a420548f9a709356ae8e05 SHA512 13b1abbf4599f7fb876ee83e6108c1565fe13dfc6ad1ba49655993c1f1e5bf02168f13c2f470a271c92186324567b7211478b9910d118b10975e1a41c1162ab8
+DIST firefox-60.7.0esr-is.xpi 529000 BLAKE2B 1ff1908cf5a497e064ce538325486686734a60dd879bb34214fdf88dc21e2dd372f1fcddb91a46f255a28755c661aa8d62eee748d9061fa0382047e8ea5965a8 SHA512 5886bc216b46710c5f8d1fa83ce62adaeb10e9ce924033eef0c0d72007653a598d20379f596a165605b9ce1865cc6397cc4485b693ec42e57cf04148f9a50437
+DIST firefox-60.7.0esr-it.xpi 414823 BLAKE2B 47c4bd1cc04b19eaf0f8897ec35f31ac3aed51b1a07a85385dd16ad4feef3c89786867539dea769bdfb8692191e3f676e974e73b222b99968756878dcd0b028b SHA512 fbf77f6c55a502e422c97befad6ff7ec06d54b02b7c448e46c8ccb57642027a1cac61d096559494a56f31075252a6afd63cc119597b7596eb4e0c715fbcd5ac7
+DIST firefox-60.7.0esr-ja.xpi 587748 BLAKE2B 3236bf74425f4b400ec91cfb2a9f9d1b77ae8bdc243729870ae9137aadc4c728747a57e50d8f83dd381dd692c7d107c0bbca2b5f2b4247fc09ec9a405bd9fc11 SHA512 eaf797269881bc6329495096918e7c660060f71c4eeba7a99cd42a94752249c71f23b89d4c3d3797eabdc688d7ad4d38a8e081226ff52de11dff51c8c1c3d142
+DIST firefox-60.7.0esr-ka.xpi 572565 BLAKE2B eaf19540797a1a9a0b7953ce04089bbf302acbe62dc18c5577bd3c9781db2e986b4919cd22ae572c1e16ab29f3a381036dd121c2f32df12726bddcf209d59ef0 SHA512 442c83ffdcff0e3ebf5c6f3f842f7e4076789335aa77edec2d366161c28e7d11e7badd905fd65591b67cc49bbe2f6006a23a8a6ea0c46ed0d6192311d8750d25
+DIST firefox-60.7.0esr-kab.xpi 536341 BLAKE2B 97678f57033f7e5a2e8d578a93d51a76367ff5622f4924334c1421f232fb768139c270743d93e09ece0b570ac37d2660a7e3362bafaa54fdf007d8793f7a51e1 SHA512 19602cadfd53a0d70a5a198eb8c3a44d3cebe3eb4b474ec43550e9df9765b10cecdd2cc97e500d82bdcbcd603ed5e6db1acec1ce70c01aa11dc57b4435e62f3a
+DIST firefox-60.7.0esr-kk.xpi 598694 BLAKE2B e4d0a9ea6fdbfd9eb4295f9a123282e7232ade6bb45e89302fd0276743adf5fa07209545fa2ae1666753563e79dc3fb34b1f79339a12752ee247641ede9a926f SHA512 8fd54f32872513c57a491074379231a97ce29475e49e701c2c81b26faa4cdf9bfa941f4f4f9f6e0f3dcaf56fcec0a0281580ff9ac8c61a7e97d87eb0e3a96cc4
+DIST firefox-60.7.0esr-km.xpi 598812 BLAKE2B 5809f50ad35c7344e8b4bf9e8297e75f732334ba3aa6ada4f805d4058191a399e549ac71d4107c5a310c3e74a2645e4396ae00d1b4c8da24db6eff6d242da3b1 SHA512 27540394ab8e597a0256c3b7a8370b8191574ba0dfa1fa8c17e2e8df08b79157b36dd85672e7f49c703417ce1c02287462efe22870c5ab7e2a7bab386a2dd193
+DIST firefox-60.7.0esr-kn.xpi 601585 BLAKE2B fdd5b97c7348423c913aeac0392b90dd3cd80e16c32a00df864e64c924ba15b48a2658a6fd049c0d321a9c7e13ba6819d3d91cb0c3452e73428877626c29216d SHA512 08380b89c8f099ebcffb05a0af1ce216c977cd00e0098febb16b11dc68c83a990074754adeeac34cfea31a13a3f7b259b2a9f1b01f192bbdbb9f9e63b70c41ae
+DIST firefox-60.7.0esr-ko.xpi 563551 BLAKE2B 24f44952915c8b690829e13241673ae4784a7c9040ca43fb125869f46d59a8d97435c69afda68d9009a99ef5117797db27264768d40a311a940032ed6f1c8ff5 SHA512 a2825e370bd99211f203b705825fd90391b3f689b1274507eacfbde21fa8cbaf16790f142876fea4f29feac839521c4b2c6a695ab2f5f88a298cba90ba805fcd
+DIST firefox-60.7.0esr-lij.xpi 529124 BLAKE2B 0d8c37a97d29a48ebe5d94173b2a0cdc436d89c41ee1d047400e540e149331d766b09d8bff23c47019b7ecdbcef347583d4819f7e61ce02dd118879c41e4892e SHA512 5702298ce9056c37d350d96f82d56ac0cde36c4301b05ca111bb66b0b76e1be04382054228fdb7059a6380b4924d949dd2706177efd04a7c96418c69db306ca3
+DIST firefox-60.7.0esr-lt.xpi 552184 BLAKE2B e00502daf85f20955425b616474cf3f1d234b376bdf6a13325db527a5a0bc734995f8be4c864fe1eec83f8180be9b5b62132bb9226d9bc55fec271d6cb9599d4 SHA512 b88510f49a24f9032f66c4cf1e9e9895f5294eac007201d8a725d5a2c3f331f41cad58ef1053fe091cbc3256d2ae1324531833dd0ee4609fc21c611d83b7b745
+DIST firefox-60.7.0esr-lv.xpi 542137 BLAKE2B 265e6df2c81a7509bfe228dd553c656e825c8bd2f8116eac6b6d0bf9b6a481a915f5cc2eec05a5f639b2f706583f668ed41c656a4bccb323640270475411b9f2 SHA512 5f7f9a89bdc4a765a7c2744ec75448718a73ba816e617d95d8e1058e5370851e501662394cf24305883cfa6b5fb0da1f27a296d6f25402e4f341c323e01e328c
+DIST firefox-60.7.0esr-mai.xpi 565193 BLAKE2B 0990f4fa2bee2713a60b62086d5de7413835d97ec2d93871bb38169dd0f81ce33060a08436429ec2b6f3349d366f76f4eb799e104c0cbd823443ed5487346cd5 SHA512 bbbb420f8ce84e305af940dfd1f49ff3c134a86dbbdc0b44e8d176806a0658103b3c31567f8f5e958d2319c3383d4c5cdecb94a03e70701890e7e88030849a89
+DIST firefox-60.7.0esr-mk.xpi 529517 BLAKE2B 3f20abbd2e34ebf9d4b0c0ef2ce4ca03d7da8d5a87981ef3a2a436cfaee7fc0857bd5fa8aa74f1f74e2f28b093ba34fbd32cbbd4154f5a4dc6233bf42a9e7d2e SHA512 4db41618f202b34841e50866fac83549fc24712365ac285c03994b355d08b8454c73091a427a7b0752c7d71e83f8a4f075cce6341ce9f828450df13642509ee0
+DIST firefox-60.7.0esr-ml.xpi 614690 BLAKE2B 581c1a730d571450e61f23904475929a45ac248e83cd1b69f45099155ceda0e6ca9f470919f616d98c0c2da0ff0338276f7fae4b6a4cba0b82bd223df6ee4100 SHA512 3e94d9fdb5c9337cabae7971e52f452ae0df0070f4ffca55560b6a332cdad2b3cb96ba59fefce61c239f1585607fd49cf4d31988b41e9910913dfb0961165b69
+DIST firefox-60.7.0esr-mr.xpi 594836 BLAKE2B 3ef2215f8e7814223d84ce8e0a17ed6d332f0f90eb92843423c547775503f13bbb6a840cc4552cbb7428ecad91e2e566100e425f32744f0a8a1ca7c9e827c0ee SHA512 ee634d38b5fd0b3630c2df306541b21984ff5e9507768976ec095b4cab8f0a89a223d99c098eec635c704dcd8f87e4f915213a387c017f79779ce6ac76ef806e
+DIST firefox-60.7.0esr-ms.xpi 525277 BLAKE2B 63a33e5eab60676678ee4f675eccaf8c9ed2d540730acf7d5bf8006065e7b302ae7d43a5cfb1718d841a23b40f127e21c8b2f6bdee2d0052ec8ab7e246903533 SHA512 ca5360a300d0f0c7f475bb15dd0b026673352ac2588b9cfd261937a27cbf951b2562b9f0bb7dfbab61eb328064c21e22bfae5088fa7cf72d3bce8a97e540aebb
+DIST firefox-60.7.0esr-nb-NO.xpi 526286 BLAKE2B 4d1bc0a657950480f284deebff3bdd1b0b82963c5d203aec6537c0d3d9dedffb0815654598747642c8a9d2440f86a6e8f207f14bad16f305cae9862cf3a2dc29 SHA512 3990e9947ee615b77a1516d5bc7878e8a16afd73345372e321983b213c021d8ccb79a05b934fd99fe138d878760bfbfb4298b26b5956500789d1bcef15cc6d00
+DIST firefox-60.7.0esr-nl.xpi 533196 BLAKE2B 90049de30e71a243d84eb369c0895c1970aabd9e4f1f9d2e71a89a14ac6332f0bf07270ce18f6f2f3fc285fb7c0858d915b32f1bb84a169c6292acd4aa0de622 SHA512 a0c640da27a11d0f651e6b87f31c7d368e0794841bc33586e8b0f330d6acdbcd0c698359597e869853bc34300a3a9f0db9c38fd4d9cdc7f638975868286da332
+DIST firefox-60.7.0esr-nn-NO.xpi 527834 BLAKE2B e4efc8bf3befd4aa372334ef79cadedac39767985f7f2e5e50c3b00605bc069f28829a1fa5b0c9f77fb6dacfe07ab1720dac077354850bb2ff172208aab6e029 SHA512 5ad89c2fc80e80c1d323cfc3c6eba0ab6123a9dffff8243cae76df768a500947ee62f281a1de7a486e038547b185e5e1ab1aff8e0d409927c071057417458db6
+DIST firefox-60.7.0esr-or.xpi 556580 BLAKE2B cd8b95cd28592587af25be96ab5de3eef06149346fd69d743ddcdbfad238326be971ec024e6b005331e495693dc45a26b73b4b9d2f56669d7d04568f33867a16 SHA512 bdd2d01a902609a877a478c61aaf8304cd285a3472cb80abe5a09ebd208184829bff6fb52228534debce4a658fc08a2ecdd77010916f74c7bbb102c2d78493f6
+DIST firefox-60.7.0esr-pa-IN.xpi 574271 BLAKE2B 23f1e6e90fa77d096fe26ed6c16efca4eb22241ab6e3f8558ee9c057ab6c2b762ced100c9d9d01b2d6b7c74183d586408c0e611947679ada2d45ed03010459d5 SHA512 4f09aa0e7aa8907fd4dd36f3697e13d4989c5dadebe7da50cbb0e111e2a52b8ec8d545d67f56e81ce7abf2b443579695858561ebea891814963c1a5afed93c27
+DIST firefox-60.7.0esr-pl.xpi 434748 BLAKE2B e7be4850ab1c64a590265ef6b65ff372baeff55cb044803927c6cbf7537d2bceb96bec4ab87daa61f2946b4d90616df854a9c9be7d1a73f7b4984b276c7b2939 SHA512 535d5de28cd98a34aea1110fd8845c091b5e567632fa1639dbea0732c0cb148b59bae2523511ccbbca4bbed6431ec3abe83f7cd85ea64eed553b951af7c25f75
+DIST firefox-60.7.0esr-pt-BR.xpi 531151 BLAKE2B d60268c5511f4d697e6121a2d06ccd44d7b09be89481d10f482fd620548ac8c3920fc33308878d904500d814e616d472e5a82fee7b5ea9e393e1600a9f7da2cd SHA512 0ef7c295edad701bf9778922250bc4d6fcf0df35d1966681aa281c1d1c42317c75bd633f8cff63875198fc508dd662f04d6be4b7eed3084b1f03957dca286352
+DIST firefox-60.7.0esr-pt-PT.xpi 535763 BLAKE2B 7ceac7711cf39fb8c0f5d7ef7e9195389285496920392492d54e663e4fa6525a30cd17acfd40dbef27bad686239ae7015ace8e3be644e09eb93b54384a0e1e9a SHA512 4ba94384ab2054631b57882d91f5b74b8de66fe9e6cdfb834316df5c72b8cb31450e6a14bf62ea0000849f357bfd9b51ed327e78df11902ba63b74f4667d16f1
+DIST firefox-60.7.0esr-rm.xpi 521760 BLAKE2B 5f495bebfbc7c3d559c4e8c00637344e1d951b080866ca9931fc8d9d16102e80bfabeb8f3f7565ca4c68795913b353ada95eab1590e4f470286e67bc72f1093e SHA512 956a474b162b8ac3d1a4d77c97bcdc199868f445423bb249b32dd71f3e1732e0c74d292808f895c7539b855d3a81d1fb0f0d34c3f505c70e480a1f466bf9e7a0
+DIST firefox-60.7.0esr-ro.xpi 529779 BLAKE2B 5f0744b99aecaea2e723278f2cb776fce9360704348fc5c55e3286ad71591a57013140e596f78dd3446063daa02ca81e27eeca2fb3b8aa892dab9c3201869f6c SHA512 62b8cbe3f24011f247885bee7b3cba08e9ef55e2eee4ca94806138e2fe628e5fab97824599092ee6a4ec7ac54b0ea846970434b6ff74efd87e6ec61cdef8fd0b
+DIST firefox-60.7.0esr-ru.xpi 607128 BLAKE2B 6113e1157e744cdd544028aabf2c08b4c5427ed44a527434e033bb6fb6955e43fd091f5eff9a99dd52a3a426406a67a5edcc6c9f8761b5c1364b076644690f32 SHA512 4157220130ba0ea1f2c2a885cb5ddf9888bc6766911387f373307a66b2552a2f4b945ad99a2ace6db267c2818434769ddb617f8272c2bcb93af2ec94e74de513
+DIST firefox-60.7.0esr-si.xpi 561290 BLAKE2B 92f5b3ce152e6da8843624c3df1dc682119d20b7c7a6b690c1657611e2c9e9f4865c64191b84b408039b8155d92a061301a33ef33adb5460baf63fce0b7bc869 SHA512 2c65615735bc9e2480d1cf2c3e7137b35fbf5ec064979df234ebfdb01e6e145e284132fb93f8a8a7e46db5d98dd4af1d63a7632a40d1c396d6e7985ac7772e3e
+DIST firefox-60.7.0esr-sk.xpi 557433 BLAKE2B 02e7ff2a27e2d37890fe4494e8a90cab081cd708f9a625f067e9ed247b179dacf57d4cd525701b611713737625c2dafdebacd015b090cae7cd5a55c596f30d32 SHA512 9ab15044e34c48ec656290c35a834c0d5f28659c4227042948f92836a8445334d23d5c6ff9927103f166d76a06f9a8e01a3d4c38ce049b9785e2e6ed499f36c4
+DIST firefox-60.7.0esr-sl.xpi 535088 BLAKE2B baa634996668d62e431397aa1e586d9ccf3b7f9f1b95c84e0a152de62381e0428e769e27b715ba337a6725e61cf88468ac8b787a126613bc85e65d690a3f96e5 SHA512 cf20cde94c6b13b5d58181beda9fbeeca0336fc2fa7571e3c4bb864e02a0cbf035268374a966e10a6e6d941182646b508ad793204ba70c06e2db21cf65462113
+DIST firefox-60.7.0esr-son.xpi 513647 BLAKE2B d71d287b8dcf4fecb2d4e4113279edf2c7af7ea25e7ad9a589832261b874bc80eeb4c4a4b312569f9af8f2a276b9b728a39eee10ea3dc00fb7e9f6c856b82228 SHA512 4d42ed9cb567490dfb17fb73fce6fb66656931b71ec756bc5e5a20becabada792292c82df340d91bab231fdde98b5bde5aa9e326fdab6d1966c69f0e3605b614
+DIST firefox-60.7.0esr-sq.xpi 536982 BLAKE2B 45692b17abeeb3592296232befe5ce850141caaebe33fc42f5269beabb2136aba48ffdfb99242ffafef17fd8a67556bdc278aa2185a5ee0d0619908ce867ad7d SHA512 6036d16830cfaec30cac590723c9b1bf126eb29a18903e8b1d20487b4f58f2b0127f8794c0112899fdbff6fe420820b0bbb862ea5b1d9c4ac185b426f6237d63
+DIST firefox-60.7.0esr-sr.xpi 564497 BLAKE2B 819179a9793f76821f6a3ec36b986ec01b9b704bb9da4a33e0e3b5f209720cfba311a860fbea3e2846937f3ba0494a64e5a73f37666e4b1f53563478f52b8079 SHA512 1fe8a42962486ce77a3fe6fb9550609c6b3ed97ae79c6e7d729974ac8e7324f0e101bb0eab87cd68469583b43613e08825f74de65f5ea778fc97c3cbb2c54500
+DIST firefox-60.7.0esr-sv-SE.xpi 535061 BLAKE2B e68501e2c3a11b77a3d129d26ffebc88eebb829520f5c85709ed57dc794c999679f3d214e844a63dc1563bac9b79eeacad8651fff6358bfb736b8b08f957ac71 SHA512 e342ffcf417c67c90181540615b1a19aab961fa803493f939605dd8b0480f385ba2bf28be524dc0d904f2689318ddadbc950d79f0d795ea3c19eb395c3d46423
+DIST firefox-60.7.0esr-ta.xpi 593639 BLAKE2B 1981c2eb72f1611edb5ce549ddb3060a379c274b3c28a66d4888ee56ade9d3a0ae4f6541d45010cedc175c70564662e1f8112044c6ee791b61ed951f02ca48fb SHA512 00382aef01723bd52ae43a0c7294439ab8ba022b068712a4d707563388d81fd5d76479a7d79fb52642f538c6a6a137e9eb97791a59a547c7b08aa5fb461acac9
+DIST firefox-60.7.0esr-te.xpi 606690 BLAKE2B 7990362daf24ed84d84e0866fee24e96dec014721ad40becdd090199d7c2eeadff7d8254e74e6364cd9b137c725e4473c78b7fa388f1d38c53ced3f8d57ec5e6 SHA512 024ebe8f35bebc8f2cf1c08ab55383862c512c274e155ccb3d55b14b442b4d65ca13ba0715bc944d2e768c50db1578d38eb8b82ecfcc09fbf61f95ba7b4857c5
+DIST firefox-60.7.0esr-th.xpi 578533 BLAKE2B 655d94b95c0674ace609b0a9ebe0b7a12b12ac04b756eef6997ce785a5dbbe286b0fd1db6d2c42f6652574110bafe130b7b920ab5ac879607b4efa0d7162030d SHA512 79e2e3ae20726ff388898c2b479acf8590188e060262a3d3945606a1a35a28c05bf23df8b2086f98585474a2b4ce9176c6ad17f5060074f6e29e57ddcd806bef
+DIST firefox-60.7.0esr-tr.xpi 541582 BLAKE2B bbbdc3903897c6a6da09059f3607eabd34538d1f07c96afe8ea9068d0755e6d1f8110dc3f9f0f2de24601f2ace553903c53703710b48ac08ebdee35d2accfefb SHA512 d4847be63219bf66c4b3d1aa56cd78535612bddf240babc7e542d0d3a83bc84648dede88c8cc10bbe908bd2c8d77add4fe9b948d9331956e89db90a172622717
+DIST firefox-60.7.0esr-uk.xpi 596649 BLAKE2B 69e5aa5c30214b512e37ed849e2cdf4070b2e47ef612b2999ba4983cb5ba53db2ef724a25de9842aa2829b160a3840964d251f5443a214ced2c80f0553e55d2a SHA512 d8fc652dd1af7a60a7f7044b1e99fcc77fe69eb728401ba0d98cf1b901733850968cfb1291a11ad46735ac750af2b217c28ad7ae535cdf4441f1119170e294ea
+DIST firefox-60.7.0esr-uz.xpi 529399 BLAKE2B 0ecb8b9891f373c543b60f7751d0bad3a134bc36e0629b3abe47cf3580e3e1bf151b4a0da2cdc1f2108d15d213e2363572a9abdba1a18f1571ede3777b62c9c7 SHA512 de7bf13f6cbdf43e5a607c0e46f233fc65c24e7ca2bd74b0a08b1c4be15eda44ac040f569ecb44116bbdfbe0df156a67fc5e3a187a553c2523ad638406187d07
+DIST firefox-60.7.0esr-vi.xpi 543907 BLAKE2B 9c7360a1e244a626670848e75778c2650c33f9b6bc6c0b0833614fc337f829bfbbae86311d90ca907cbab891cc9e31fac7688455078b28710382529cf1dae9b5 SHA512 4c571dcd3015cb651e6af462214384e01aa4eb02204fa01dfbc6a270919feb91110d60df5e483b6404231f3fd1437d64430179c030bc188bbbfad1317fb933d2
+DIST firefox-60.7.0esr-xh.xpi 527565 BLAKE2B 6b357e8887f61aed2ed513efb9beb034d126c3ef9b73959b6f10c25f221f73f334a8bc87ffa6f983df956a5fd54f66c6185f9f87825be2b00759d4b6e38ad4f8 SHA512 5bb606666ffb6598987953fec0bc555d2a37c4233a8ae98e738eb1dd5fb3432a4ed39f6b2ef0bdb6e7af2570506460b0319830a9ce9a21b8a8f2fa37f1d6c3f0
+DIST firefox-60.7.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c4036d54fdcd6524fd24d5e67f08a6926ebae10a70f0a961942a2ce752e8017cad965bf9e45ec32e825f35e5605539e30a86 SHA512 d5d63cad9411d615c0aa0814beca1f48cc033327ae989641a9e4930a8f6e7e5e6a4cbcb875b26fa5e82b631aa9a99aa35ad3710308933cbfbb0a15b9686094de
+DIST firefox-60.7.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
+DIST firefox-60.7.0esr.source.tar.xz 268497160 BLAKE2B 20bad3abe5e6bfbf203944e68a88e91ce669d966d6dd56f8caf29706ef0ae5b93d442e672354383fbd413e9264efae96e6ceb20bbcce1dfbbbb912d43c923f27 SHA512 c2152857f5f1c816a12fcf5c450268025ee47ee9299ae3355650d86c7c97191b731123a4964154222ca5ba1edc44fee0d1d5f803ae9515841283ecaff6dc9a55
 DIST firefox-66.0-patches-09.tar.xz 149336 BLAKE2B e423ce6c607c350b193fb88f0dc00f7c7996b4979ec2ac3e049e9ceabfdc558e704508f6f5c688a3733d4dee5bd7eb9c744bc98637ee45cc53ac37f8f82cb0a8 SHA512 9b760ee99a6d36de1c2e5ba4a87e2982ce1934f8f1ccc4212cb9f308ad16b7d5865958d0ab153fdecaf3c223543c0a6aac69313dd73cbc7d7dedab77254fcbfa
 DIST firefox-66.0.5-ach.xpi 463182 BLAKE2B a804865f36afcca09c96c1c2bcf74b11273cd4df87ab742fe111335f2301b6780ebddcf7db167584ce45d019f6766f6c0f585c0057f4fd198358cfa668efd742 SHA512 18f0b076fb3bba6d2993a55b66f1f6541517281fd83d3dfa7ba8b77df29499e0239bde21120fbb4b9cc3c42d8b7c3fc083191a0969465c76e74f2bfc98c00f22
 DIST firefox-66.0.5-af.xpi 456307 BLAKE2B 56e350abcf0e85bc967eb140f0289be3d5d17ec7e9c5969cb81aafc8a59af8c95a2d5ea6dc5bb3b2f3c0ee02ffc3e879c02cb37caba4c8b83c75a3ef8c2cbe48 SHA512 1477ba6dd00023d71d9064910aa393340ffd8ebd534e47880e981175ddbdc44f44f163a69f2996a43e4968d34d2ef7360e274745ebce241cd2a97eee6c61c9ba
@@ -277,3 +277,96 @@ DIST firefox-66.0.5-xh.xpi 472383 BLAKE2B bf94d4ad4d1a6303d8c0cca06fe37d33ae2556
 DIST firefox-66.0.5-zh-CN.xpi 519059 BLAKE2B 41621b14b0142d5df23fb7dfafcf86e85b4e1a4bc4db33de01e210cde5f3c257b6c76bdf87eb46566c0456485e77d57c3a9982a6314fe890fe52f6dbfa75c4a1 SHA512 2b73ad9dfb21f29c4a94eadaac3de6ba71691c5e597093214667c580a9327d1c92b28969aca1b58f70a9213e0765db1496df3599f9c13906ba1fdc8cd1b27a2e
 DIST firefox-66.0.5-zh-TW.xpi 516709 BLAKE2B 57baacb801c95f28e7c28a746113c2b1e04d0edad3618e53249cf73380d9678520b30cfc17f04e0e4b0f18a08f523c0147ac14548df04dc565484bb09dfb5ba1 SHA512 db6e941bd100df0afe3ef4e1dcd81b96746d2aadcc63618709ce18f40416d83f096615c285a7c428e6e75d08883d87c3bd770b7e94f411aef47c7cc3545f505a
 DIST firefox-66.0.5.source.tar.xz 282561836 BLAKE2B aa72ce0b047257df2a0a3e2331f433a45a55a72c1c3b0097076b55b43eaa5a51510dbbd2295d744f6cdef9aab34e8cf1a15a85c045bc3a43941afbe47092d267 SHA512 6e62e7bb95a7341471521c372506d9df276249d0c0863d059b0bd27537cddb1060c51f0ee103f79239226d34c6277f3855e1511a083bc4cc442718fc7c5db650
+DIST firefox-67.0-ach.xpi 473023 BLAKE2B 1f668745bdec6e3d67a82964b1cbb63832d6727d2180a2ac5fc64ddf841bff1b3aee257d5d8b789f5713dcedfdc179cf00018c61355e13d50e98a7d0306e2a0f SHA512 02731d08e8c4c5d202712e589b9ba746d61edcedc10ed02face7c2beb5a083a0d9c3ba4a98e730a650351c9256aa87ab20c79857ecdaa150288de4b22303483f
+DIST firefox-67.0-af.xpi 456844 BLAKE2B 5418a061dfd899a76b49fc6b95a2837217690de31523f2c30d977cc3b27eda0a06352ed9ef98860dfdbef78f815d47cddf8da5710ffa918d310eaf3a3b8a5a71 SHA512 c5873b61871864ecb7a3c8b61102e09ac216cec73d54136235a47e31d7f91fefd0958ef6b5b86838db628a73c55cccfdc258e9a6d9e441e2fc7c83af2715b648
+DIST firefox-67.0-an.xpi 486595 BLAKE2B 48f37550939beb3f11856c23909f3de50ae0d21e70cbd3224cdf59c90c87b9bc849ef91186a6ec8424f662be19156e9f68d568877eeeda4605d226b68e3c18fb SHA512 d50b8fde6413739db839364a5dcc61c3ee154e4b1b1760cde4d674306c0af383b1c5a0b2d9cc84f01e502bd6cf1c5dfb30024aa2f4ec9920ff3d95f4b07bc644
+DIST firefox-67.0-ar.xpi 541846 BLAKE2B 17851d024b0522952e2e4f9e5cd174e60df1d0ff24ba4fd2689e5fcd3b47dbc2b80001c4a3e7c49e57117b470ff659fb0cf97cc1c601bcbc8a4a4125fc73ff91 SHA512 23f99be5aeb2c295431a456e7deabfa53329bdc3f28980c5f5a73b7b259e8e7db3bb162c5e80cf14ebc91984e1af169d8a053857b85cfac10856cf59fe696a92
+DIST firefox-67.0-as.xpi 493292 BLAKE2B 60c74cfe7797fe6a5e8cc9b8197686e6a032953f488702f14e4a8db2b4fc559c4a3d52f4f6949791746b9b723f1f28cfa395ccfbcf9ea6b17e73aa552630782e SHA512 ff9bd4371b415897f2a1d29605ad83db89c32ed5f5728e27bda3e681adc062d532b9de8ac4d0348028cfb79bc4af94f9d93376add9fc316cb1b0f065f5d41e5f
+DIST firefox-67.0-ast.xpi 485528 BLAKE2B b9be81dc287312d60d88820e01ba338852386eef9f742841442444f824df78991a56c0bfac8dd16f4029377b7a8844140f988aece9c957b1e73163eee48fe097 SHA512 d5a24450086ea4152a2d9f1fc48b395ebe9806e81053d34b8b9931834c06ea2458b45892474298d718e8e52ec8481354057bebe1817c691c78ba6b9fb826865f
+DIST firefox-67.0-az.xpi 512474 BLAKE2B b2cd48d8eb9453d072cee741dbebaf4aa98a4f9e61c2e419a62d3a54d009db9cba30ce33efa0befd7ebbf5c3697003d7b3b01dc4e04ac777c2d8682300505456 SHA512 5c10d01b587e0e0c8120e5fffe7d4daf66a94be3d1c8a9f8536484cbd0ae1e40642c64247261c89193270b307eb702412c13a482271f96c08d91b4cf68f4cb77
+DIST firefox-67.0-bg.xpi 549334 BLAKE2B 2cb987061dc88cf3b9370705c0bd902f1bab2db5c2756dfc8be1587465050d3e367c2016744e004a6c41e536a64bb2e4695c567c8949fbff4e0cbc58c4520f05 SHA512 f2e90e7b1163ee50be11646990df95b2fd79c16dc6e45e9edf2d7932c246f00915722dfc7d55eadc1e0767fbf7d0d3ff538112e9e24c5179b7ee99e0f80dc696
+DIST firefox-67.0-bn-BD.xpi 567129 BLAKE2B c29707546d508948de1c35a76661526b04238760831e7eec3f6453b1019e56beb5d518216c87f1ff766ff4bb234cbeb2172d4ae8b2a9df00822c5098502987f3 SHA512 035ce4c0ca9016c2335ad1dc85c57e7fa5acd993b7afd76560166ff5d04eb03fbb856429c43ccb2b7ce7977344e840618bb30f9f5a766ae6fe746c7da87d61c9
+DIST firefox-67.0-bn-IN.xpi 556825 BLAKE2B 2111580220c83ad4600114d5c3e5bf16dbeca4d39da18c22a8900edb87f48c5575b4aec85f8b757688065b8904e4545f62b6e0f1eb24ff8272d5b7c40bec16ad SHA512 c3502e4129bddb746eec01674659b266e7f5999ac39613237ac8f02ccaef269c204a4f6ccc71680fc7f8b19d791b29d67dcf5b63596bd32db015a535e1214466
+DIST firefox-67.0-br.xpi 501331 BLAKE2B c416d76f9075fb6154fc8803d3431a58850d1764c976fb3fc6ce92d2418d08ac9bbd5e646708f80dd06d6e5164a1863b7c037368d45e7239c795923a13d0bd53 SHA512 52bea0f8c25d44bd48aba09261fc6a684cb25c02445c4a04b658ef1df79b8459ef5885654c6a627db391a5ab3f04191f9264bdc2de092f4b6a41826ad23e80c8
+DIST firefox-67.0-bs.xpi 484174 BLAKE2B 5c617d9eefd20b87993414c08a8e8bcafab9d48caa212173a573c914f7b49a7362d8bb276c147763227ff0f8cbe7cce8f3c5976151bf540c9272434f9120fe89 SHA512 bd1f5f971de35c606d9b0df0a33c8529a087b627f55a5f196a8c58214d53086257f829fba41ffd514a3392b7f8670d975e58062cb0ee72ae673b95936a341d1c
+DIST firefox-67.0-ca.xpi 496524 BLAKE2B 2aaa1d8ff42157d0656937f8333b84fa2576a2cc3b2b27a41e83f669c4121f84f654c56a84047a113b2ffa7b1f56d9d508fe9819f36b00631dde7b257a36a9a9 SHA512 6cbfa1c99dde478a0213ff6f76e9c6a7fac4b905b30ce28b7c281fc65c9ffb707cfc4892e2d4558045c707621632d66fe45b51eda4b7396dc6ebf8a98bcfbd76
+DIST firefox-67.0-cak.xpi 525402 BLAKE2B 40f08c4a7f8c845a4604c05527f078bb0b962ff933acbd3264968056db5dfaa99a0da543cdaa69232fccb589c1f37bce911e52ae464b52f3cd58abd920735e26 SHA512 a928993a4284bcd709dee12c077bdaf4ac9f32eaca5ab9b1a225fced15e37fce11b6b5a0ac6567aadd8cdff8ba380c3d853725deaf5e15f9976d54cee6900a08
+DIST firefox-67.0-cs.xpi 517489 BLAKE2B c0516cc7e24700e67f28c8de679535f78592ff625eb403e2f95fd988371f1bfbc7564ffd1ad31852569e63ad0bc05d8f01feeff4276eb8354a13da41e83b284a SHA512 79d3ddee483af8920392d3bed17ecc06b294cbc2f8eb0c03becf402acddc8e32b0a32674c72b583e0be3cf281e5d98200916c93102d43d5aa34c70eb5b12a8fa
+DIST firefox-67.0-cy.xpi 507758 BLAKE2B 00ef1d61b660ee66088e93279a3300d3530e36567f8c03e797921d2d276ea2e05884110913948954b69938ada2ab64438e589384b8732de6d16e02d880c04658 SHA512 84fa6406fc4c4fd189caa05d14825cb81750dd02a57cba1dc64a508f29472081706744a24aaa90056fc44f6ce0d436d26705ffc38a9d5f8287537107da34eb7f
+DIST firefox-67.0-da.xpi 514817 BLAKE2B 1c0f66a7e742802bf7094e5bd40900349aaf4e5dc7e442e61b3408deb5c3c63deee7b9a970df7d61c1ef5497f6ccdd50f78bc091986463a0cdcf22446b9446cf SHA512 7d92670bea6a12a0f58542b9f7ab5af0a06bcad32757774639803277d42e4a136d2a9e8b5af7634615d54cf32ba603fc544982a0b5bc3a9b18cce2f671b59c39
+DIST firefox-67.0-de.xpi 510156 BLAKE2B 6ef0ffd61093c032e3e1582978b736b805be00c7ece22b7f32fe540189d42d80fe7f0b32b8d054ae3793d2b5aff979e9764df8001554420b10f3b1b16bb61bdf SHA512 95ec3b9ed66da69b30652cf71ff42ffaa1cd9f3a063989ac086334237b4e3d93a4c171a1292741159d514496eb68b7caab69a0a8d5ce456e16b304302a3fc6f6
+DIST firefox-67.0-dsb.xpi 524855 BLAKE2B 350ae317fe86889c333d2bd87bfb29e2ba6cf9b5e8a11ee8136dfbb4f3184f718da525f339e71972ca0c83ba3f0e5f880dd1bcc2c10b60496186509c012fc79c SHA512 af8f5da3dfc1fec3f2a93805be61905f43da00602fc97e8be23af9228f3a34fc1520434b8e9ddf9c1c937cb89f4cb19b0d012ac34d52dd298e552ece10d0fe3a
+DIST firefox-67.0-el.xpi 592177 BLAKE2B 0e15524f6d2bc21d26880b9d2ef74a6259b2e89f3ac173287f7b8b98219aeca4422c07ba80aa774a35e0d9892e24500b36e0124622e6a50fad1c08502bd9fa9c SHA512 aa06745c27a30df089697115e77c5ec8f3b4b9d491c45956347b33a7702a64df31e5f41578f385eb7f3c43065aa039561a7327d5b225dba74abb8b8805e3594b
+DIST firefox-67.0-en-GB.xpi 474307 BLAKE2B e1baee252fe093730673c085d5c123b507e016f1f2905b92e263dfc822f9533b8d2aacec89e2b200e1fea78b3387c1276bc09a1e261da501b6eaf99a916c31a2 SHA512 3682a667626080b5b0f44b3a793a60ebb1ff6b50a4547654632bd30c0410ddaa5f9708bf157d64888d5c8624295f2f95f347e99afc35b0491777fb6894075bc1
+DIST firefox-67.0-en-ZA.xpi 442976 BLAKE2B f799bfa41f8b03eaa2cb988b25f9ab282b17d21b01545cc7441422e97ab119e8a2bc9f070fb6f66575673c486081dd88140db83a3fe5aa7f2671206424977c7c SHA512 5ec9cdf2939bbee4d08c7a812aca3a2cab48b44fbc6c5ee39483443dcb6c68e2169381455ee03d5ee99569f920008ec8aac386556187cc9cd049055a2059bed6
+DIST firefox-67.0-eo.xpi 500805 BLAKE2B c5f85274a5e7aa8e15f44175a17bdbd5da62c7dc61f2636324cfbf5e0273a785b959f45b7cb32f991b86fdb7b5b8be47ebd250e0623898fb2b2f7d831af775c6 SHA512 555f061792fc2b15f17a663b32b6dddbb1ec578f4884f66c02d3d3e6b88bb40b90a67a2b01b1b165e07d2dc756b38bd4da276294ba7782c9b2b978d6a40e98da
+DIST firefox-67.0-es-AR.xpi 509287 BLAKE2B 5eaa509085f39777ec3eda5e672156e7721b48bef5cbd8440e49c190507b594fb3bc24674d32a1f1c3ea5c9f595b0cb5918447299bdb39c56735f310faccfd53 SHA512 3c3bce37416752c92f436b5e09c33583b6eacdfc93396d8fe6805bf2876e6ebf9e8227eb2e1b187a38439f06cc6d4578f07ed64978f7bca05fba6e6d821d7a49
+DIST firefox-67.0-es-CL.xpi 508067 BLAKE2B b2e6c19910dfbcfff4e64b1447813198397469c43dfcec4d7ddb2fab800a4ce5772f819544eaf2fbbb233722906c62e4c75a8f8ecc05b4484914375fa681b2ef SHA512 dccf2832144f1995e470c01adc2dcd94b073dea5784258946074aa5835b027d99f6790a1259287c4e825c2fbb2709d0d4d2b552583e0f04567c73d57ea3ab420
+DIST firefox-67.0-es-ES.xpi 479115 BLAKE2B ea5a7f0b6437be573c5280a07765eb524e0416449e6c6603f39e0b90421e44c250e92339cb1c945d4c87027d31b22f7e97aed3fd1e907f1c99f546b6a7f124a4 SHA512 15cca69e099bc209b6ebaea8adc2d02bdb7b67b494b681356b5982c976be8583f639a486107779b41f111cb6bfd58f61590780627a4d4c730bd123d289d6375d
+DIST firefox-67.0-es-MX.xpi 507050 BLAKE2B ea1b7e60dff1ea21ca7c1360a538bd35230033b0c75e6149adfc56efbb43535f5a2c33f8af8151a9f75aae26a9b16318c62d54a5cfe50db3e54a84c82899d8e8 SHA512 07cacd6795a711c00a4ff11481e66c767fd2bdbb988789256780de4b8a3844a5ad3a7f4f39f56e40a7f89688e2472abfd23d9ec98be33ff2657babb2c472ab28
+DIST firefox-67.0-et.xpi 483622 BLAKE2B ea611e55406db52e0397cac44a3e1f7235604379eabeb238c10303bf92a1c11eb77aead6078fd82d6202f604d3c45dfa9ebc917359c0788be90ba52e01dd2c81 SHA512 a4c007fc12753709dd9c9ba339a1a2db064e89c0333b5b86be8371054141dcaa0d0f9e30ecbaa8ef321aa6e41d2a75ac19be7f637318cec2f8d153bc32399454
+DIST firefox-67.0-eu.xpi 497739 BLAKE2B 5be0ae120589879b79e0dd82db0b070e69b469c2a2e2af42e4fe8d42bde67f62ec79a0feb3a28830338850f0f8e438d49b85a0606d356028518a85e2de56d499 SHA512 f65c70af331ed820715f68c9d2b0e8e9d5db0b38fb46d92b1819ed8f6ae5ecad40e1cdcb7b4f0458ad138273a1ae04a61dc1fc95bce04fa5a25f301b13e60b42
+DIST firefox-67.0-fa.xpi 552219 BLAKE2B b1449b035fadf58027302acfc8fc59046b102c58880d8b8310801e9da0176390c263e3db8eb8e809511b3e83018985b65a6ccbdf83ddfe21275cf4227c7f6f3e SHA512 bd3e550920e12284ab62115e014e6f4879c453f457bf3d53ca3424243f4db0d11cb02052de82ecb5302aab7aa18dca5045d13ad1df1adcdf55e7bd4743fcd1c3
+DIST firefox-67.0-ff.xpi 487121 BLAKE2B 2e64d7b9e5c39f2f3bb30b7f280abb3a796c2840c1b796d2bffa505d8c55f44f55b9ad2fa26887daad33ed31d9125cd7efee58f200283a17dbc11bc916226537 SHA512 ac0ed9b165f809a6aacdb9d727884ad6f73783ca4232c52e4ae6e3bc1e5a2038be6733fc8327ae1e17ff57afe7c7005eebb12c813826b9ef6edc34b5816ce766
+DIST firefox-67.0-fi.xpi 490362 BLAKE2B 9f0db7f260ef8df7d7fd56c1810d06006a7815b91cfd28db315b5235c3339816a958e731ee01b5aa2dada0e3dc45a502de1fcbc7043eebd36d26040d808d5f69 SHA512 d6a7288c77b355bc527c16fd4ad13b2fbcae630d7379df3c62a0ef388af566b96f8b02e8d0c8102cc3f889edd4dc57c629cbf0557303f32382dc188ea7988a23
+DIST firefox-67.0-fr.xpi 520005 BLAKE2B 9afc36a8c7f1190042e34b56646983f887e2109d7ae59b343983c99be9859af3661072e11e661ab2633298bfdb1a7690378a40680d54353315926946d28be5c6 SHA512 08503ed4218e92b58f4e14242de17f281f97ab82f4c43730a39817c1cb6979b8f695a68d6b02d8114c291513b5e7029f73e63fce9df947af826bf88627b20b5d
+DIST firefox-67.0-fy-NL.xpi 506201 BLAKE2B 55e895fc2819eedf9840a499786c2c03a6262f87e486bb8c00f31cadb3e2cfebc3d4203525be554ca392bc41f6886da1bbb4c58b66f2aec2918ddd9a97aa4f05 SHA512 4d8c4247cde6eb0ad35d3ce260ea6e1b35c3f4b7e0efd2000d3f558bb1048186e4c204be4bfcc76d1c278b953a5a51606715767e6422d693a0a22dd4a3f9083d
+DIST firefox-67.0-ga-IE.xpi 489162 BLAKE2B 8b7fa7c901bc8801109c1e152c4632a3448834de5a54ba4f7a91d929f2900f5121deeb65af906c21ee5a334ae18884c2d341bf976d1b65a27a4b4014120df079 SHA512 97dfb9579ade379a1b8b5d36a61dbb343dc1239a3c84bf8bcfd743c9e46cc9b37de1b8f039fb7d82c84df4b7e6f1a9ed4f32854cf04d07cb598fc6ae860a674b
+DIST firefox-67.0-gd.xpi 511069 BLAKE2B 42cab5bd6b7a8456ccdf87cc9c6eb394247d1ef2a66262f9f5ec393ef020b3c6f7abaaaa8e300054d950c595bd8dbf730fa2ad96e4ebbe0b1929e424a6a3155e SHA512 13d5f050308877ff080c528da2a710001d556f381d001a5ba3640e50eea6718cbef4fa90fde84a2cfc195589b260ca199f1962897b478261f0c2abe5814de414
+DIST firefox-67.0-gl.xpi 485875 BLAKE2B 57e3c23e19ba8a8a7850451f8501089c10ffae8814187aae1de90dab368659c3b5080f5e8a9eb912a0cc1592da8c721ffd7cd59c651fa9c1a21a69739f5143c8 SHA512 bbcfdb77a1a516d97bbc7a739106f40f297057ebb109d1d27b317c991eb3f7dd1fa74db00e82f5becf8490061c06d4467ed2f821479b44ef47a6ea0df6e822d3
+DIST firefox-67.0-gn.xpi 515717 BLAKE2B eb9a88d966e84e85c50ffb13ad8ef1ab60e9dfda7269bd90a30e253baf596ea9d7b589aa945a04a626dca076e5dff5d73937911674b4228624876db45f08c887 SHA512 3e4a7c6a0c27970cbecf06033f46d49194aa50db0cd2fe95125972ebeaf0d2738f2da340131b05252ce5f81dca090fbf0eef37e180a9ab304518a17167d0c31c
+DIST firefox-67.0-gu-IN.xpi 574594 BLAKE2B 4325203fb1f86a3225fa373856211a2dfc00391ce541df3c6188bc3adaeecf8e06e065a360600c94d55bdca9ce92eafe54344dd4f94cdb5afe5f89af448c58d3 SHA512 aeb77a9438ef8bf6c7cd144fdfd0b3a7eef39d3c625618b3b13ee1df4ee443e9c923799ae866f181435ee2f19e6f2f09a34122f77282a08e88a2e4311d17021c
+DIST firefox-67.0-he.xpi 514592 BLAKE2B f17a76df9c708c85567bd6950d43ff89bba3d99e9ae8f8bd8c78bd159e82c105d8ecdc6cb2e91b481340d26054952f9165072f90fa6c8ec9c7ccf0a0fd379bd5 SHA512 623f9bafc1290ea699fd99dc5f405faf597f5adce6754d36c44c0095296004deb93d95fe8d889c30e7250fb88a9aa4039ccab3ee91ae37479a51f7666869593e
+DIST firefox-67.0-hi-IN.xpi 559704 BLAKE2B 3e01626b7fd65c05425f8cdd977b63f1b235cffa08be64f735301c5c1dc849762e9a51b8dc6d42e6060bbee6d4717c4b60df803d8576ecc3ad651387fd35e0dc SHA512 2c6c9397fdf1bd7b4150a16581a30104b9bc2ed25eeb8e0363595a26042eef0797a98b297d1e21f331711fa7b2b0f1a8fb450afc2c5c0022d5885d37d1bf8d4c
+DIST firefox-67.0-hr.xpi 492453 BLAKE2B 5bc4e0e520888ad6f43878d26441bd47d222011a78a7ac35fb48066d006efd9724f96b56423a9c6237e86d61280d5520328c19e7728c63cee083d361e9009f01 SHA512 12a8b269ce60eabee4d2e8e66273d627d73569a9ba290aa14dbf4507906961a58a3b0de256dbe1d667aed117ae32fb8c071d7c6380b9ffafb068a004255df96d
+DIST firefox-67.0-hsb.xpi 523953 BLAKE2B 24520bb99b4681e5700420f8ef51797b59da719a71d86b00995e2924f70232f07f6164dc851654070757d9018c70992ff004d1750c8ac8b332658f877ab95739 SHA512 e2893a73a3c107fd73943e225f67da4acbb742e5bd434cbcea1582ee56ce2f9e5b6d3c3cc81ec6abc41213098f9f4416694a317ba7fcffbab02f1332bc222d5b
+DIST firefox-67.0-hu.xpi 525574 BLAKE2B 1a72a7d82506ed11814b8c5210bfef430e22803e9ce0b5551ebdf7122864b9d1e32603836e7f44c7d70567109c3b21ab19390f617ab57cc85bf494e3257880b0 SHA512 bf0f5608b76926ffb8759a09e1a8ab80ae5eb86c69c68bf7ff02fc3e6565cc93e8405eeb7ab5c464488fb0de319781b3cfeed6f887e21ca7c6c9f42eb501d790
+DIST firefox-67.0-hy-AM.xpi 546320 BLAKE2B df46d20eca94185c7f5af70b3a3e479dea8e1410fd7180cebebe76fd4febd1bfa82a3a443856a62f869ccfdd75a9e8be7f101e1378bcb7d861fbaf8f775883c9 SHA512 1614010511f07d691a5f3c551c94ccbd61348a5a66205b22fb592fbb1dc13b0731a1115d59d0bfc15df59aaee8d9261c71c315a63cc5c0634a4882651b87697c
+DIST firefox-67.0-id.xpi 491017 BLAKE2B c8f276c4715a56d0c658e7bbcdb7754353e80bac70d1d106266ca88d537e47df92d3888bd5637caf4c078e39a22a308e2dc478bd2178c2e1e35af22e2f0a1f6f SHA512 f227339c95aa37c3280218c370c6e777269f308310221d2a1d11cf8506949669747956d5a102876a9da431e3174b9148a4597697e9e697f760bbc793c40f0211
+DIST firefox-67.0-is.xpi 496689 BLAKE2B 72bc9a145c5e31521e672ecff03b4e07b6ee9a318dab675e9e78d6676b7c578b25db4a04f2a3097775dc89b45985b462a16681319c58385af3de678322a4d8e2 SHA512 3bff12e1ab0bc05ff14afe6aef54ec6cad6160347d1fc5c17eb85dcd7c58c235122618554ac9d8dc827f1d2a1d7782f077ad925b9778f9f340d08a6a1210e1c9
+DIST firefox-67.0-it.xpi 389210 BLAKE2B c964e384380bfc402bbdb51215ba35558b237eb8a1fdbb5359c8ea84b806b551e2e8d946b01a702e1d8be63248009a807bb52208d90159581b7deb5db3709cf7 SHA512 ea44ae4a3f3b4dbc373e1eb1daa9d65408f5be4daa63385edc661e0b0ae7ca539bf3fad675ad4d7eb499a35ae2b9098358a60743b6f1d53d90e794a5ffa46ba5
+DIST firefox-67.0-ja.xpi 533884 BLAKE2B 998adbae64e3902a8624223257a92c6921406d05d22c1e9cde528a49ed3f4b9664eff0445874764beabe5acf0c948cdbab293e8f5dfe4b0a830b5d65acece02f SHA512 308ece21ae09fcba6059c47903f87961b5772f848ad10aded397acf3123748b38efc86654a511ae5cef3ed7f4acce82b06cce32293fc44de3413744ce01112b6
+DIST firefox-67.0-ka.xpi 550087 BLAKE2B 5fd0d2492fd05785282c461ce2702d0cfc1cfaa3b0d1fb484b211668a4b6eaedba57aa61eea449ae50b3919ca90338f8fb92836bab5673d4b0c86870a1075fd5 SHA512 206950c26b70a23ce5fd394560cc36fc1183db5259ac7b91d6d9762bd5b66a631c7c7ec4c84c33a17421109532db41e5baf9d17b485ffbcc4231cdf416b0aacb
+DIST firefox-67.0-kab.xpi 508876 BLAKE2B 1184a2dc76c538f5aa91ee7e897504d943b0ea0365e193ef1fa9649ff8a2c870a271ee80156d0569c4261b6ad3c39f1ed78948f512e9b0e85b1638bda1313a82 SHA512 a3bcfed59af4253834c051360281557a72ca2830db22a74346815d548fdd4f862afb596b6c8437b4b843f65944d8f45afc1de074a89752137746887c9b3fedc5
+DIST firefox-67.0-kk.xpi 574829 BLAKE2B 1519b2f0db46de46209c15799ae7136eb602a5acca6e70a06c705c539f85124abf84ea2540de89d974a9315d12860af3a12b61fe57d43e6927320a00ac3f126f SHA512 a8b8e8e540efb091b6e03a140e27d1f258f500bc26f772f4f9ce132eb7be3c5f6bbd0e3e4b8954c368c96025f6e52fbd1d6df4a4cce98acc5147bb70ec547bfa
+DIST firefox-67.0-km.xpi 557304 BLAKE2B aa677b9cb669be7e6f33c6a41d8cc290934a5d47f7863d1a62d1371daf5d3b69e50d91f08b09f5e2fddd234980cc55fd58e09193e6a971b970828aa49a83e29e SHA512 e6b27b1dcdf9c30a5f73cd454cd2af13ad43f2cdc352b9f4a6767f2aa5799321e741acc11e62acd0a6668b8352e2436b7d5e3bcdaf2427ffc5872fd6717f9dc2
+DIST firefox-67.0-kn.xpi 552972 BLAKE2B 30f0346bcd4202baf5ba6e5ebf6b3ab6b3315402f2d94ec48f5dc67ede9b58b6978b29f0c6bf4e2e3c889fc78787441dfbc2ee0600f4f633aa465b7847992d8f SHA512 e34522d962551999033c9c5978badc3f63e741cc052a297f7d0948bef00b221fdc5582fd1affc570f7a4dfbb099e8c63d928153fcbf82fa095e6e2def7cb4c64
+DIST firefox-67.0-ko.xpi 535116 BLAKE2B abaa7914f05bb9a6ce6e4ee450b5f001e54a87b55006e5ba839758e2b03e30ff7406ec1b09dd1d87716e06a0590cb6ae26b6bd2541946cb8148189f6b99d1141 SHA512 ddbecd2361b2f8589e1e0b2c5fd74973a24e8894eaf348ae3e8571a0d3160663e7ea7d94660db155e1c579f887624e9f052b654f462191cb1b8ab92e93d226e2
+DIST firefox-67.0-lij.xpi 483275 BLAKE2B b7ce22a47a0e6004c37e016cf1c1342a3188c70e44b6fddb46a6a2a0fa009916ec95f2afaa980fb0d56ef490e590195deda0bd3638c11f74178acc0cced98ce6 SHA512 4fdea871412f1e440d002a04b2645f1aebbc28d1337c2cf2ed127361e8ca81a57efe5fe01128eb933d98368a2de75988aa00c2a76e7c339a9e92289eb41a530b
+DIST firefox-67.0-lt.xpi 523549 BLAKE2B 6c8104d43cdf9a5ebbec543749b2cd842e43168b589f823ee77b50ccb073d37e75c6dcb29271755ffb645edfeb2e37fa81681282a3b55357a18c3750cc72a100 SHA512 4956a32e68871a81ae13494c48bebf322e636d61c8fb92ec65d30c91ced9036e2908aec22a40aaadaf5343233a3712362e93d31c67825f7e745e2104477af110
+DIST firefox-67.0-lv.xpi 503313 BLAKE2B f009f6a2f81bc770e9924262c68cf57e0bb8e117449eb8ae1e2d1813be668a1df4082bbb2c6878356dbbb9dbfaeb10a69aa47afa4ea6b232bb833eef1153c976 SHA512 cecaedb404cd75bb1f2f7e7768cb9aa360b4649e06fb725dd1f65eb5404ba0033a35bff5bfb479edb065552801bfa01094a0e83c093f7f04fd52db1f3a05922f
+DIST firefox-67.0-mai.xpi 511904 BLAKE2B 369fe67f38400c65e3bde3549c3c8e03a562025f8d0e3a5bb69ab373dfb7f2b94f32926b9a9b9039940f7c1f04e60e99174be8a1b6e1847daec20b45b38c1114 SHA512 b5a19f474b6d91d278e49d6188db2d001a52333548983a309034fc89c608d6e57aae39b1cfae332207242da209cf5b423db12805d6fed53bb7f3820cfd3803dd
+DIST firefox-67.0-mk.xpi 486617 BLAKE2B 52a0e773c68de7eeb36854e439d6cda709ca5ff99fd62fa0e96d3edc666f467b5cb82e9c5975e5d9ec31051945094d11dcbc3df5ccd3ae82b7d9c4e5b9b03481 SHA512 81d5515a7d0a2c0b1fb331f69133c014703bbef70fa6e0634acf33c7bc2fa1e4e64b3e698e026fa98c1c7b3b982a297e4c2009568e7007d9cff29f0c6ff6b80e
+DIST firefox-67.0-ml.xpi 574481 BLAKE2B 5492e9ad2cd7dccb61e9f9e7613642c80a20ff8f2bfdd6ad4fa5e7d69a5b4d0ec8f1eca3792ff56a18d0eb52e9a10d1fe3cfb1953f999c715ae23cda49e1b2ab SHA512 199e3d6559a958b6d911892f43b0bbe3cbb8dbe59f45d18484b9ce239b512ef73fc66c969dfa809465b4d07ee433aed2e692b3b8d509632885be9aa6e22842af
+DIST firefox-67.0-mr.xpi 559662 BLAKE2B d3e79ad5ba3098b9216a8ac23213a33cb328896ccce183f24ce719483608ec01d0f374a43442b2cd6cbda0fe1a9aa5aeb92553957338f0025ef17f388ad66a6b SHA512 4741f84b95746fb562105be996cbf07933be463cf388ba827ee9cd17bb7f65fb92a5657827f0c3e01135514056b26ad183d56ac284d4ed0ff6be0f3bbac9eefa
+DIST firefox-67.0-ms.xpi 482414 BLAKE2B ff2c68b4ad78573316e954bf813bf36f3010754c5f440084d6f3fc5316bd8d798a1f42a75f59576d5e06fb056bdf9bbafbabb19b580f5c83c84fcf35f2638493 SHA512 c6fbfbadca9375b7b5f9dad2fd6f92acef245d1ec266d359a43badf364053c4e2a9130f60346dcbacdd77db60ef7d9e5cf98db09c8e7c09ea43204b974cd5be7
+DIST firefox-67.0-nb-NO.xpi 492535 BLAKE2B c34a7c266ac1a9292c477cf27bcbfbdec4ac8c13eca4a54aa6c04bc015d550d92e2e27fe8e02b5f3ab94cedc15bd881c8e5a7fdf4421150aab2173783e2a2156 SHA512 cb924e39b92e8fd29056d943c85dc3af6b4a5d96c930a28bd56b6039b295dd4cbde3e70a80d700b421071031c6d09ee61923e228fff3c540da8fa9f51b71ea08
+DIST firefox-67.0-nl.xpi 489396 BLAKE2B bc55b85740ae1d47cafd31dc38bdef4d16aca1a62a3582eabfef6971164c9585b41d12d3d13e1438f9688a1bc130a543bd2320b61d4fe7ee1498d74002f5b2de SHA512 c60bf47a9adddd549e545a6ca9b9b78e531360fb8ace4dcf9511ea676efc41ec485d2f01065dc3b9ad17ed719a69edcf7692a7acd7678926ccc103be8a957df9
+DIST firefox-67.0-nn-NO.xpi 493980 BLAKE2B 37e268dfda7c694a773d168a4f215e7dc663499624c9161335ca49d40a1c3d382df2624f1d37cc5eb49c397824caee2c10602afa3ac7370003d06b9c2b179c7e SHA512 d2242d23045fa695ada82b9a3d3fc392338f6f3fa1c72829be7fe4f2730d236f85e82afa0fe9bf7fedf312b3320f1418ea02ebbd363e272c493065346247e84f
+DIST firefox-67.0-or.xpi 499781 BLAKE2B 8487af9fdc16346d3a54fc7dce9d6799c5b9f64c6b4b3cf8c327863d3da20d7af2fb8226e97bbe9e1ff2fe0032cff59a51b1d03062ae8fa67437dd4c1ba7eb51 SHA512 5a31d8f533d127b7b6e650c84d0c61e90a00666c59dca209f16902e67e1c725efcdeef452af7190d0f32d46289c56deaf69f6510ad2e961a3f1bfe24b34e0ed2
+DIST firefox-67.0-pa-IN.xpi 546156 BLAKE2B 56819972bd7f0fe887411fb238c8ca1b914a688ff6e806003065149e6015a08b5b045d0d16419a5fdf9d0ee34c9e9969d6bf351f4d83ee84b0489e547aa29814 SHA512 f7c2d5ff779be660274d52edc88f9fadf728fa8fc950a7f7616dd596a6d7c95e278ee8520f775e001616f57333abc0def8025e574db41c2ce5513000fe1cfdfc
+DIST firefox-67.0-patches-05.tar.xz 164292 BLAKE2B d0226ccc0732f7f4d63af44a76bff6c7bc0d0f91cbf4156da327f9c58ed81a318c6cc59a914fbdf59f5bf30539a9cd354d541878e414ad6b7eb2cd22b1fbfbf0 SHA512 2fc4400325dd4868f48d3c090fea63ad13f7bf23b01402c456ce7ad25626e9fd4e2f8e9139433abe182099437856713801eb90049cb69b5a0dabf11baa43bcbe
+DIST firefox-67.0-pl.xpi 485692 BLAKE2B f229542dcf7194d498fd82961cc324cf5567c227c8e84a3d2fb470267dd3cdddf020ae1d218b1bd15bddd6684a69173dbdbe04e7a3bb600a0def09f6d6739f5b SHA512 6d462008138331f73b0d20773406db36b9bbf9e4fa56b48faa7e0519a24ce77f55d0b494ea46df7f1bf2497f66197860266469b873ea572fe70c2143dc8abcc7
+DIST firefox-67.0-pt-BR.xpi 499903 BLAKE2B cfc05f2bbdec1a70296c7c969b0fb4196504c88e0f4ab5acfa4c2a610baa2a1f45567a5e4dcc9af2c60cf1962305d5f68062784e0e6896e2f416cce07eb23277 SHA512 ca5ae9e6364beef7e52e3edd4d52a06842b55806c8eff69a4f8580cbe4419379142c9e7f02a8dfe15e4f94ba5736e2e8dbd6b48a4c2d8f61b754e21a68fc4e44
+DIST firefox-67.0-pt-PT.xpi 509660 BLAKE2B 3e59c495ad86d016b0e89b5f2c0e8e6435c6110f982e969305c78911b69b10ea695ca27645f088bb62383e6ee0d04ac04847fadd5d141350b356c5ee243d365e SHA512 d43d576d208b6e9e92a1f6de19b5d407a4350c5f43a6d4dd2eadd2bad512ec468f308204fc76f60e5021db6a3cdb8a4406b2af4ef0d4324fc8964a07ff62d0b6
+DIST firefox-67.0-rm.xpi 499055 BLAKE2B 67425251d2066cd5cbe5dc17c253b602b1f04cee9e39cd1b3f78cd3a4110e9d094d8445d57d76a811bc1e434ee0e56b9e8e0b0ae7ee7332e66f83496d922d7b2 SHA512 7297109c7e8e50f2611031d0f66907c66c436d7fe45ceded35c70dc5682e7d32055faaa648e0d05e6f43c790858dfe653676e25ba74166e2632295e90504df16
+DIST firefox-67.0-ro.xpi 505667 BLAKE2B 47852844f1e66dbcd34638040f66b253b937591f6f435a2528b04122ca34bdb98377336b222f8ef15b4e99481830dd4ea3075942175f291715fd663ce761bd63 SHA512 35746a3b7605ea93f0c1bf1916cc2a0701a843da31f2ec90c78e1975a92aef7c910119b64eb0af4a2eba9f06ca6a43572ca65eb248f6362973de1104cc7d052a
+DIST firefox-67.0-ru.xpi 579654 BLAKE2B a988adf8d269e9b1ee30253e817adfc574920ea84f71d583f75bd95f09c58a68c2f557c55d6d411d178c628bb94b27feaf891222676309c2dbeb4836ce9bab5f SHA512 e6cc4bdff6590d8952834d20d560faac142d6f189d7d7af3e28a2755375147f2b847b1b9ec864c88972c10eaf33d643bb6b5d140b007335408349c43ba44dbaa
+DIST firefox-67.0-si.xpi 532085 BLAKE2B bcc89dbdd567299388734b88e7538189b0dfbdd0e5c768965f0d42ab98b978c726b2b0cc6bc00dfdde0a3c6cfec8fd7b866c9059c9df4e43aed1b590878e9ece SHA512 b30e5d645ce4e5ea38d207f118e5f1a89c8fc75a62d46c929927455daabfcd38f3cea9272c7fdb63457d955211fdbdfbeb7528309637fcddb1faaf5b001d53fc
+DIST firefox-67.0-sk.xpi 524995 BLAKE2B 6a709943e07ee03dc4c8d319c82010c825ea39d260f3dc48094fab36029d6a3c1b6d2531071ef36539894bad5bafeee2ce238492c24acdc6ab19b35d6be5bf1c SHA512 c7ed56944c6523f86dc71926def9a76d4f308f9ac1f824302dde7c55491e0a742f2192d7b667a2db05520921c0cb7e1a585b4ddbafabb8c9e56d6e33f310d78a
+DIST firefox-67.0-sl.xpi 499860 BLAKE2B 5de7b058bad9aab6bfb7b217da0506599a28c18bf9cf633ad3f080eaeb049614937c9199348119c9ccdda9c6d36fd3bfae3f99e416fdd44a4e5380576ae6e02b SHA512 9b3c40b4f79348f266375bbbdb5f15e721ff733692df89edd38b76755d83dfd54bf10a1b451d466b31c905bae84352ea65937897bc9210292dc27538c26bd905
+DIST firefox-67.0-son.xpi 463856 BLAKE2B 3ea9f4a8db31a3897d8e4a2d3ba9e90b935316339d862df4fddc042cf9dda68af15c7a1570cd403c4f2e513eaa261e1ab5b27208bf0e40a6b464b8ef8a47dc20 SHA512 6370ebbc741437e1d94fae911783812a0bc1121b1030edb1d391d39c43d31a72fb6acaabcb3b3b9f9d9a5e72cb3d10e7cb6a114059b41d7d137781a864e6c81c
+DIST firefox-67.0-sq.xpi 517474 BLAKE2B 195cbeda28fdbb2db5aedc8c79c0e65ba8c32cd763a235109e94685f9d26857786448d19d6525cd7e3b30c7f3aad77a45c9aa8b976396c3ca0d36d826d2e406b SHA512 515a2a605e7cea18a979a396d3bc5a72662e34dbeb7afbcd29d7b961df04d3a9c2493b8dfe87c24431670094e7b40c390430eb73ad42998e16e22ab99ec3f53f
+DIST firefox-67.0-sr.xpi 531347 BLAKE2B 61485100fb612e76c0f2c0dc905d9250b592c5c9b8c63ffe3d495a6decbc9a22344a34fe200415253b8387f30c9417130b86daada5223322230b33634926c433 SHA512 ea7e181eaced1f4e76f565ddde75852000691b490996d143c0032d36e56e228e624c2104eb9ea131d998e1bd588f7ea016a18325a66686e03a76c87271571f76
+DIST firefox-67.0-sv-SE.xpi 507857 BLAKE2B b2997ed85af9c2458436dfbaeac855cff9b10ea4473b9e68e592ad9c98d154548a705bb372c122e4c8c8c42cbeaf3e870800ab0376b658b0d486d633576d0896 SHA512 6931ef1c1749ce2fd24c7f70ec22b56d81a69a6e66656ec712247a3f0aefd70b2ab2284ec324c5ffd65d0e8a99da67f0c92e1355a06bd7da3752a16b84e31a66
+DIST firefox-67.0-ta.xpi 553749 BLAKE2B bf8c1c0546c4dd43fc1283eb6eac02fdeaf59c80cd30e785043702466590bc7cbfe578d464997271bc8ced599fb94cf583e3e22c56e3541fbfada6394b344db2 SHA512 fdceec3c0b0616298f1670b1f9351014a1b19f8caffec7393678b6b2cc23a12f38e8b67954a1632953710d1858332f58c4e4bd075ce95600a2e46b186c765291
+DIST firefox-67.0-te.xpi 564806 BLAKE2B c452b0a4cc1e92b5aaee6baa27cc20f6f95b29df0b4eb401f3c3f5c5510fe91a7d78fb9357f8f867fbccfcda6ab649de81634ba7b585fce316babc1ddeebc1f1 SHA512 501a12d430360fe98e2d0fc5e0f5c0b26696307825269746732a16c3251221af7eca04eca1214d69bcf23a9a7bf381693ac5263cb02ca3c25767a65b7a207858
+DIST firefox-67.0-th.xpi 548934 BLAKE2B 7b48976fe8b211562618f1599595fb57dc8656b0e1046f86d308d3715cfbbeb0e7be6fe4f6fea2d26e3f291418956d41766d3527597af49e763eaaf6eeb62ad1 SHA512 706a060ce3db7ed2e1f0bc5a8893026e70e236bf2cbbf93191377ffcb9d98f45c1c46df0c8826e07741f134e65410ec0c12484c6b8ceed7674638382aa3d4ce4
+DIST firefox-67.0-tr.xpi 514316 BLAKE2B 40b4a97fee1ec6112848b60c06b1491e4096f3c7b89033fb492d6cd14122529b6b2667434f1b9890c85067eb909d61b2e66526989d6f15374847fbebd880f16a SHA512 b61c958847ec9c032c5958a6bca77a16c33dcf0fd637595611780cba501e1153e1a09100f14fbc40e2ce76bfb95889d986a471f8603cbf69e2c0a706734a254e
+DIST firefox-67.0-uk.xpi 563844 BLAKE2B 356fe586be4124679e9da75c05af1ef7f202244131c63b93f77d39dc9490161e86af4a4b0b17cfafeef5e1380f14bc1cbe631f18110f7130173994c580f201d2 SHA512 285198ff3a42ca701f7806470730e5df02aea3f3141a219e418c27678f7e15605eb7f53a4650535ac638d734850ccc7bfb955536fafae4352f9fa3d4901ad5bf
+DIST firefox-67.0-uz.xpi 486671 BLAKE2B 5484f2f7f4b544e2c66977b8d3dda61e903233856f90448e7399cc611add5865433dde48d9b40987537cde38c0e2d8cf1d73b2aef77672e9ba67dd0ac0e391f9 SHA512 5910b32454aad61798612042eed18e59c38130ac04407f6bd2e24504e89eb9666ef0c0eb36e3aa5588d6f0d85bd9efadb38991269df1ff73e44ffbcf54b4cd44
+DIST firefox-67.0-vi.xpi 530343 BLAKE2B 57465db64e1408ca15eb5581e6c97779e9b0d390c6054af6b8054535d212248e4866321fa5b06cb224f5bf7060b3e4233dd5f91e775340bf7d8f17498336261a SHA512 db4a56d4b1301eb3c29a54cd5e369c995a21e45acf82f81314b858fe3ac39a5b9b2f80dbee6ac60afeff90ac5416ab90da912be15c315bb326eb52b34c1c25a2
+DIST firefox-67.0-xh.xpi 475483 BLAKE2B 77532caef41c358188e4fb6a584c3afff316e25e74b20f50ea503781493b086c25d7f581a7696853b2ba8c3fd052c4bcd9f1c575e7465d1cc7aa4e41503a8478 SHA512 008a712ef2bf670ed1970da6d7a2a605d426e43b45217f1fa683a9dc07f3e6f4c6483f8f74a0d07a4ea0ffbb1b6fec23ec9018808f253e21fab92f0abcea9b8a
+DIST firefox-67.0-zh-CN.xpi 537479 BLAKE2B 4947f23b125fd2fa5bcdbcd48400590d2e35fc1c2e7301e8db7df2725b9d8c8e3b89189c7f9b1443b2f07833a4bd4fd5fab3ecbe242c1c44e2f4cecdea382b0a SHA512 4fd7572f7327a891b4c68726bd35cb5c844c3863bab45df9e804a38a7eb4699367f0be59cf07f833d1ffa808f8022986f240b84648ecea9cb0b6eab8a16131ae
+DIST firefox-67.0-zh-TW.xpi 537618 BLAKE2B e62b4689f5f4329efa57c45309115d380057b29238f254e623c6a58adba87142b2f874096750f3cd678325046dea91396f15be488b389b00d80786ec2c206cf0 SHA512 28b2dfe48d7642bfd5509f95da1e0adb034b137789f513068089e290d5e74fd3c4e53ea3d61f884680a2ef577eadcd4d9f16720917ed93a3f417eff3a6eb5313
+DIST firefox-67.0.source.tar.xz 282874008 BLAKE2B 8263d27da7237c2d366f0fab3de0bca551d08569ebab115f9cd356fc61c2ae07365d21119522cbb7606d2c5541bd088cd287cadb9f69d19fa3b5a68414fbdc74 SHA512 a1000d6ca8146a9a3c74a3f69041b755c0c5014c8a608298d9c4cbe39577939d43139a7ad742983697ae90b635d3f5d8f9a008fcc2b3778adaadc25acc49ca29
diff --git a/www-client/firefox/firefox-60.6.2.ebuild b/www-client/firefox/firefox-60.7.0.ebuild
similarity index 100%
rename from www-client/firefox/firefox-60.6.2.ebuild
rename to www-client/firefox/firefox-60.7.0.ebuild
diff --git a/www-client/firefox/firefox-67.0.ebuild b/www-client/firefox/firefox-67.0.ebuild
new file mode 100644
index 000000000000..7f5184eeb318
--- /dev/null
+++ b/www-client/firefox/firefox-67.0.ebuild
@@ -0,0 +1,752 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=( ach af an ar as ast az bg bn-BD bn-IN br bs ca cak cs cy da de dsb
+el en en-GB en-US en-ZA 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 id is it ja ka kab kk km kn ko lij lt lv
+mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq
+sr sv-SE ta te th tr uk uz vi xh zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${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
+
+if [[ ${MOZ_ESR} == 1 ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+# Patch version
+PATCH="${PN}-67.0-patches-05"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=8
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 virtualx
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
+	+screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-sqlite +system-libvpx +system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+CDEPEND="
+	>=dev-libs/nss-3.43
+	>=dev-libs/nspr-4.21
+	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
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.2.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.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.7.0:0=[postproc]
+		<media-libs/libvpx-1.8:0=[postproc]
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.27.2:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.8.2
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.31.0
+	>=virtual/rust-1.31.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? ( dev-lang/nasm )"
+
+# Due to a bug in GCC, profile guided optimization will produce
+# AVX2 instructions, bug #677052
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
+
+BUILD_OBJ_DIR="${S}/ff"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# 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 \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# 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.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened ; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	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-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	mozconfig_use_enable geckodriver
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS} -O" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 ${_virtx} \
+	./mach build --verbose || die
+}
+
+src_install() {
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Add our default prefs for firefox
+	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
+	fi
+
+	# Augment this with hwaccel prefs
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+	fi
+
+	if ! use screenshot ; then
+		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	if use geckodriver ; then
+		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
+		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon name
+	if use bindist ; then
+		sizes="16 32 48"
+		icon_path="${S}/browser/branding/aurora"
+		# Firefox's new rapid release cycle means no more codenames
+		# Let's just stick with this one...
+		icon="aurora"
+		name="Aurora"
+
+		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
+		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
+		# (source: browser/app/profile/firefox.js)
+		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
+pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
+sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
+sticky_pref("browser.devedition.theme.enabled", true);
+sticky_pref("devtools.theme", "dark");
+PROFILE_EOF
+
+	else
+		sizes="16 22 24 32 48 64 128 256"
+		icon_path="${S}/browser/branding/official"
+		icon="${PN}"
+		name="Mozilla Firefox"
+	fi
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}/default48.png" "${icon}.png"
+	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}/usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	# firefox and firefox-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; 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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 1124265cec52..74e427519d66 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_60.0.3255.60_amd64.deb 67122988 BLAKE2B 8d3b4a21d2efc7eebd2b438c7e3b2e50b328d2fab46f278bf870919f21dd688d668e43d4df211b330d514697112ce2f5f2893c64f93b862b074934c22a22638d SHA512 58981dae71e25f3c172e65a09aed0aa24edfe34b1d724a8c708b1ea99b294894acd6059c75f59ada4d24cf77040695e35c953e11440579ea2964c509cae757e5
+DIST opera-beta_60.0.3255.103_amd64.deb 67440172 BLAKE2B 8c3304ae40cdb289297e836dacc16aafa49bfb47287da7dfaebf5e967a0905a478bc060ba5be6b2709c30f530724b73e10986d15b838c3c0bb4b0958cd3c6d72 SHA512 b42bb9988a194aa50e359228031b38f4a00aefbb30d3b90edf6f3253a891a4b01d1ab8b99152fe2bfc3e91ebc1f9d4a433c62ed55d80d528e30cdf6272324ddb
 DIST opera-beta_60.0.3255.79_amd64.deb 68344076 BLAKE2B f8617cd2840d2682c8ea8bdbf20c2cd2d579f17d62e9e005cc864d666317787b205cdb5f741398b9476dfd7ca078caac8f38feedd7ca4e00274396ebea86aa89 SHA512 e7de5f9cefa7c04afc34aef6f377cd90ccf87b6362e4ac94125245a845c3e9bf6d7d9d7a99dcd4187de7aa576fa6929c110de9a774fcea5da6dde13f488908dd
diff --git a/www-client/opera-beta/opera-beta-60.0.3255.60.ebuild b/www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-60.0.3255.60.ebuild
rename to www-client/opera-beta/opera-beta-60.0.3255.103.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index bc1e6352961b..143c0ab49973 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,3 @@
-DIST vivaldi-2.5.1525.41_p1-amd64.deb 59511176 BLAKE2B 855011dede4287aaccaef01a983e5820c39bb7ae6d680813b4b8893528d678af488ca1e2ff642061f5cbbc896ebee4bf23f629d3ce1e196779d60023d0a2dab0 SHA512 ef53264bd01bf593883664b94fb821d3fd84a91a6c96ed26f03160c0d0f05b113c4767b95153d972e77e26fff61cb21023fe999959bd0923db5308b9bdfba529
-DIST vivaldi-2.5.1525.41_p1-armhf.deb 52878692 BLAKE2B ba76c656d4d67248e69a64cf328642a20a7c1a1428443272f5f04850e8a40f84baea6130a86e6789a7f93dc393d1c3c5456d2a26f27b491713998d086ce39d6b SHA512 37209067701f30d0718e320604987931f08beacdde96b33c2cd3cf487daef8f7f44a64bba1c3fa0578023a21510b61b83f061905bf4ad9e299b834d4bcfa0b29
-DIST vivaldi-2.5.1525.41_p1-i386.deb 58063596 BLAKE2B cfe3cf02bd910682d59f655f8e37e0b87390d445cfd7538442628b3e95bdf108e4a3eba0d1df0ff73b542ae1d67bf1c01409aa27f0bbdf855a76cab352c3fc23 SHA512 ad46c050e4642fc7ac040e0ae7179415133d3876f007f8a917e38f37e7b05d2b55febd712f5b51b777bd7ea672aa919f3f2e8a657e8fddf870dc6445170f8628
 DIST vivaldi-2.5.1525.43_p1-amd64.deb 59473456 BLAKE2B 6ab57eeb08c5b939ffb99195955369e1240508d82459986d6a5fda30adb612c7fe229cf8a645348eef56980ba59dfa088092d885435397d572b16eda6570490d SHA512 e5698efbd28b50cec53c1224633a2ad4790fb54fb162b0fb8fd72ddba5bd557109df0d36475ce151cf2a320993f027ff114bf0b37d914dc5453e330910b61b9c
 DIST vivaldi-2.5.1525.43_p1-armhf.deb 52876336 BLAKE2B ca8ba37a0cd12cdc30e9bcebb399ea3e19c5cf2720a3e5826a3463f26a9b5487513a30a60741fca09687102b4d754c29af1679bfa5c8b217081656914e1dd447 SHA512 ae6824f15ee7496e676270a1f5d2ee77944f8d59a056c045a4b1e2676e9d68d8e63010b2e80d1ff647207c6b00beb355cb83db7df4f56f8b8e78b5a6cb81e087
 DIST vivaldi-2.5.1525.43_p1-i386.deb 58058192 BLAKE2B e2c5132a98d18a40d6e660567603b1ce8fe896534999b8918e25be2c6a32f74e390cd9048df1ff984e53f50327c47c85ba09580ec47b0151911fb2b99d2b36ef SHA512 319effeca70f10850130cdeb3eba0121f38069aeafcd8b3f2a253f90eda5381bf64f2118098704aef8cc44262cbb282295cbb0faafcd6d762a405467f269f783
diff --git a/www-client/vivaldi/vivaldi-2.5.1525.41_p1.ebuild b/www-client/vivaldi/vivaldi-2.5.1525.41_p1.ebuild
deleted file mode 100644
index 479dfcff4842..000000000000
--- a/www-client/vivaldi/vivaldi-2.5.1525.41_p1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 944af7800047..a566a7f604f0 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/apache-2.4.39.ebuild b/www-servers/apache/apache-2.4.39.ebuild
index 7a1fd21f41f1..7c3e8d290f84 100644
--- a/www-servers/apache/apache-2.4.39.ebuild
+++ b/www-servers/apache/apache-2.4.39.ebuild
@@ -130,7 +130,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 67eb1b6ceb86..4b2d4b0b803f 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,7 +1,6 @@
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-DIST nginx-1.14.2.tar.gz 1015384 BLAKE2B 0d41b078215ca3996f434cf3d43c99a52dd43f8b1b798a4566d3f9509fa35c74c139a3e0dca8b0350ee3eb1064dacc8e76bb2fc3ffc78873eec8fff80e53214d SHA512 d8362dbd86435657d6b13156bd6ad1b251d2ab10bc11cdda959b142dd6120b087e4b314f0025d9bbcc88529cb4b9407fb4df1cfae5d081b7ea1db51ccfc2dbe7
-DIST nginx-1.15.12.tar.gz 1032347 BLAKE2B 6dfd7fc0a17cd6e92c34e568db17368561f63c107654d76d3fcdf6979688e19a6f9396ddfc421c8fea6a6e0def717337e9b9b43eb8c5c8e3b2efc6bae8eaa3a9 SHA512 58961194c4fb94136b657c75c0d2ee3fe6515552a17d66e80d6cd53d342731229c0cbb897700631517275943fc2731179780a3c4b61b93b32a2cf6490ebf0f50
 DIST nginx-1.16.0.tar.gz 1032345 BLAKE2B 187a07e7bde2dc6d7dd476372fa5e880a085f06bba321177428a4064e75bb1012950fdc31125344dab36b8c5d78c60d9f9ca963279cfa46741478c250221c199 SHA512 e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d
+DIST nginx-1.17.0.tar.gz 1032978 BLAKE2B 791e4d309ef1a62db2c135313edc85fe3fdb0c7b42b39a2a1f56059b1128199fcbcd4f24a1929ad3b4b57506f104afd5943229a8b6273d6e2ccb103fa0405476 SHA512 fcba692355c79169672c32796981bc178d42d9cf6880e8f03c99d5f518b7aca5c0414688e17b9c54f307214a64e766e1b022604e725aa4d40784f471d770f061
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203
@@ -11,10 +10,9 @@ DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af59645226958
 DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 DIST ngx_http_echo-0.61.tar.gz 53155 BLAKE2B 72565b5d79598b5dcd1c10fa0f718e749894ca5f1232d5aae60c61e268b5904af35fdcd35afcf72de93852af9e0ca58805d77cbc37919fba9012158b5545baab SHA512 c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b
 DIST ngx_http_fancyindex-0.4.3.tar.gz 25274 BLAKE2B 5ce3102326f6b8cc2b333ed08f7a66476842d2c70089175e577a3ba958317ed702f24ece002506007eb45e9e50b8f6ecb137cde222566308986cba2682b70f7d SHA512 fe5f6afc29c99f66151c1a06e27b5749b0a16227638583d9c961adc94b2942b981184382f95e70d927f00b09b43f597b963a85a41bde5903b10e42f86bc321f1
-DIST ngx_http_geoip2_module-2.0.tar.gz 6766 BLAKE2B 338c9503530ebba6076a2222fe9d164fdfe39ac603c4ecc7ad5b5d1482c1e21d0f1bc52be585d6a88968b29edfd8b1b63ce572e9ee8d8efb4d88889ef4cbb65b SHA512 32a23ba20e4ef3885b09baf938ef57405a6f23e86a7dbecbe5285be74c0433fc33eee70742113706e66ee105909deb1ec844ce36a6f33108597f736341d8c230
 DIST ngx_http_geoip2_module-3.2.tar.gz 8465 BLAKE2B 93d1fb9573e9dbd932670a595d2c0341571eaa2e079ed98e85e282712dc0cdfb798d59ccc2ae7466dab23e093c2eec17d1694f2748d80683928ad135b70b0bfc SHA512 84b26955234e29dbfbf2431b652fcc453c5e86b95f837296df4f3d6c730e3e0773223dae890eebfc9b5763f46082bde6f38d6505b8bf78133b89e7297016cc5d
 DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
-DIST ngx_http_lua-0.10.14.tar.gz 654097 BLAKE2B ee38aca7d981be5bfd7af52521c51d43bc7a8fed38c97cab29498535875380dd50407cce367e60ab3608baa2bc05556a1d92530a8b4542ce1ef0319e35f9457d SHA512 f2c4241ff52130cd116220e48a1032b9cbc8ff70f0ed0fbb918e18bb7681f0b1e07a2108b2ba5bc551a6557d87971ae4c8bda30e255acff1f7d72dd9232132ba
+DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082 SHA512 1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7
 DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd580922dc2fc9fa22af737f400c2c5f59352d93ca6cceb47f2aee70dfc111afdf98d27aeb64ddc5a4dbf617359ea4da09486ac7f SHA512 467ae49409adb675979ff591f98df8c96d71ab5ebc2ef9b3c9430e38e7e84d311b4a98c2b1cb1886d895735223dd2a43370aab61b57b34adb1427c184e6b8c86
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d
@@ -25,5 +23,4 @@ DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1
 DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
-DIST njs-0.2.8.tar.gz 300750 BLAKE2B 180770c9e56bb7a9c2e3c33c5c4ca87ce56eb16fc1fca483c952ecf9885ae45734bdd7f794d0fc316fd6191d7a6a8c093fd49dc80985ab07b0880f3500aaa1be SHA512 f4ab5dc0b807df443c9edb01020eb78979d4747111e3a529a6303100b922f9acc9e281cde6d88a920c30b4780b2cd85ca2f5abd3518488b75f6ed1b12cf8d616
-DIST njs-0.3.1.tar.gz 314049 BLAKE2B d80b90fbf27699151b5717c483841dc2899dc347c8ba1cc61ce5e3efa99290337d35a230fe5097d037bbce401a71a59e261e0b307a2d41b50185a624beb6fd38 SHA512 b2f427366e66827068b1e3956f7b4b56271d4a7aec535bfa22fe56a2ef0dea5ce1c43c4d028affdf32b8397d19ca4d03d974fc6660bf244bbbd899e23f13637d
+DIST njs-0.3.2.tar.gz 325183 BLAKE2B 6c02d260bcb968480eb02a3dbee8464b2f7dd26a0ca4e4539ed2a4ce7bf494d32b815c742034b92132d5fef3e8eb12132d0ab214b1ffa450ce11273d70d96f57 SHA512 74abf48f2e23714fcce1b87b4dbe354a8a716b1cab825591878a6fd5175400a7f3b74c3968291ace19b2f6a2620df959d572fbcf1868dc4e0f44636e8ea35aaa
diff --git a/www-servers/nginx/nginx-1.14.2-r4.ebuild b/www-servers/nginx/nginx-1.16.0-r1.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.14.2-r4.ebuild
rename to www-servers/nginx/nginx-1.16.0-r1.ebuild
index dde537f4fa24..75a7cb6a7bbf 100644
--- a/www-servers/nginx/nginx-1.14.2-r4.ebuild
+++ b/www-servers/nginx/nginx-1.16.0-r1.ebuild
@@ -59,7 +59,7 @@ HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v
 HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
 
 # http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
+HTTP_LUA_MODULE_PV="0.10.15"
 HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
 HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
@@ -150,13 +150,13 @@ HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LD
 HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
 
 # geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="2.0"
+GEOIP2_MODULE_PV="3.2"
 GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.8"
+NJS_MODULE_PV="0.3.2"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
diff --git a/www-servers/nginx/nginx-1.16.0.ebuild b/www-servers/nginx/nginx-1.16.0.ebuild
deleted file mode 100644
index 1b4b842834f2..000000000000
--- a/www-servers/nginx/nginx-1.16.0.ebuild
+++ /dev/null
@@ -1,1089 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#	* alive upstream
-#	* sane packaging
-#	* builds cleanly
-#	* does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.3"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.56"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="3.0.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.61"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.3"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.19"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
-GEOIP2_MODULE_PV="3.2"
-GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
-GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.3.1"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
-	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
-	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
-	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
-	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
-	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
-	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
-	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
-	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
-	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
-	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
-	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
-	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
-	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
-	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
-	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
-	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
-	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
-	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
-	nginx_modules_http_security? ( Apache-2.0 )
-	nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
-	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
-	proxy referer rewrite scgi ssi split_clients upstream_hash
-	upstream_ip_hash upstream_keepalive upstream_least_conn
-	upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
-	gzip_static image_filter mp4 perl random_index realip secure_link
-	slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
-	upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_auth_ldap
-	http_auth_pam
-	http_brotli
-	http_cache_purge
-	http_dav_ext
-	http_echo
-	http_fancyindex
-	http_geoip2
-	http_headers_more
-	http_javascript
-	http_lua
-	http_memc
-	http_metrics
-	http_mogilefs
-	http_naxsi
-	http_push_stream
-	http_security
-	http_slowfs_cache
-	http_sticky
-	http_upload_progress
-	http_upstream_check
-	http_vhost_traffic_status
-	stream_geoip2
-	stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
-	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
-	IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
-	pcre? ( dev-libs/libpcre:= )
-	pcre-jit? ( dev-libs/libpcre:=[jit] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http2? (
-		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	http-cache? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_brotli? ( app-arch/brotli:= )
-	nginx_modules_http_geoip? ( dev-libs/geoip )
-	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
-	nginx_modules_http_gunzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
-	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
-	nginx_modules_http_secure_link? (
-		userland_GNU? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
-	nginx_modules_http_lua? ( dev-lang/luajit:2= )
-	nginx_modules_http_auth_pam? ( virtual/pam )
-	nginx_modules_http_metrics? ( dev-libs/yajl:= )
-	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
-	nginx_modules_http_security? (
-		dev-libs/apr:=
-		dev-libs/apr-util:=
-		dev-libs/libxml2:=
-		net-misc/curl
-		www-servers/apache
-	)
-	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
-	nginx_modules_stream_geoip? ( dev-libs/geoip )
-	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-nginx )
-	!www-servers/nginx:mainline"
-DEPEND="${CDEPEND}
-	nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
-	nginx_modules_http_grpc? ( http2 )
-	nginx_modules_http_lua? (
-		luajit
-		nginx_modules_http_rewrite
-	)
-	nginx_modules_http_naxsi? ( pcre )
-	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
-	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
-	nginx_modules_http_security? ( pcre )
-	nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
-	NGINX_HOME="/var/lib/nginx"
-	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-
-	if use nginx_modules_http_mogilefs && use threads; then
-		eerror "mogilefs won't compile with threads support."
-		eerror "Please disable either flag and try again."
-		die "Can't compile mogilefs with threads support"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
-	if use nginx_modules_http_auth_pam; then
-		cd "${HTTP_AUTH_PAM_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_brotli; then
-		cd "${HTTP_BROTLI_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		eautoreconf
-
-		if use luajit ; then
-			sed -i \
-				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
-				configure || die
-		fi
-
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_upload_progress; then
-		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
-		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
-		cd "${S}" || die
-	fi
-
-	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
-	# We have config protection, don't rename etc files
-	sed -i 's:.default::' auto/install || die
-	# remove useless files
-	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
-	# don't install to /etc/nginx/ if not in use
-	local module
-	for module in fastcgi scgi uwsgi ; do
-		if ! use nginx_modules_http_${module}; then
-			sed -i -e "/${module}/d" auto/install || die
-		fi
-	done
-
-	eapply_user
-}
-
-src_configure() {
-	# mod_security needs to generate nginx/modsecurity/config before including it
-	if use nginx_modules_http_security; then
-		cd "${HTTP_SECURITY_MODULE_WD}" || die
-
-		./configure \
-			--enable-standalone-module \
-			--disable-mlogc \
-			--with-ssdeep=no \
-			$(use_enable pcre-jit) \
-			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
-		cd "${S}" || die
-	fi
-
-	local myconf=() http_enabled= mail_enabled= stream_enabled=
-
-	use aio       && myconf+=( --with-file-aio )
-	use debug     && myconf+=( --with-debug )
-	use http2     && myconf+=( --with-http_v2_module )
-	use libatomic && myconf+=( --with-libatomic )
-	use pcre      && myconf+=( --with-pcre )
-	use pcre-jit  && myconf+=( --with-pcre-jit )
-	use threads   && myconf+=( --with-threads )
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=( --without-http_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=( --with-http_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=( --with-http_realip_module )
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_lua; then
-		http_enabled=1
-		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
-		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
-		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
-		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_metrics; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_naxsi ; then
-		http_enabled=1
-		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
-	fi
-
-	if use rtmp ; then
-		http_enabled=1
-		myconf+=( --add-module=${RTMP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_dav_ext ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_echo ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_security ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
-	fi
-
-	if use nginx_modules_http_push_stream ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_sticky ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_mogilefs ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_memc ; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_vhost_traffic_status; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
-		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
-	fi
-
-	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
-		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
-	fi
-
-	if use nginx_modules_http_brotli; then
-		http_enabled=1
-		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
-	fi
-
-	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=( --without-http-cache )
-		use ssl && myconf+=( --with-http_ssl_module )
-	else
-		myconf+=( --without-http --without-http-cache )
-	fi
-
-	# Stream modules
-	for mod in $NGINX_MODULES_STREAM_STD; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-		else
-			myconf+=( --without-stream_${mod}_module )
-		fi
-	done
-
-	for mod in $NGINX_MODULES_STREAM_OPT; do
-		if use nginx_modules_stream_${mod}; then
-			stream_enabled=1
-			myconf+=( --with-stream_${mod}_module )
-		fi
-	done
-
-	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
-		stream_enabled=1
-	fi
-
-	if [ $stream_enabled ]; then
-		myconf+=( --with-stream )
-		use ssl && myconf+=( --with-stream_ssl_module )
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=( --without-mail_${mod}_module )
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=( --with-mail )
-		use ssl && myconf+=( --with-mail_ssl_module )
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=(  --add-module=${mod} )
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	if ! use prefix; then
-		myconf+=( --user=${PN} )
-		myconf+=( --group=${PN} )
-	fi
-
-	local WITHOUT_IPV6=
-	if ! use ipv6; then
-		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
-	fi
-
-	if [[ -n "${EXTRA_ECONF}" ]]; then
-		myconf+=( ${EXTRA_ECONF} )
-		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
-	fi
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
-		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
-		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
-		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
-		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
-		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
-		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
-		--with-compat \
-		"${myconf[@]}" || die "configure failed"
-
-	# A purely cosmetic change that makes nginx -V more readable. This can be
-	# good if people outside the gentoo community would troubleshoot and
-	# question the users setup.
-	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
-	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D%/}" install
-
-	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
-	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
-	newconfd "${FILESDIR}"/nginx.confd nginx
-
-	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# just keepdir. do not copy the default htdocs files (bug #449136)
-	keepdir /var/www/localhost
-	rm -rf "${D}"usr/html || die
-
-	# set up a list of directories to keep
-	local keepdir_list="${NGINX_HOME_TMP}"/client
-	local module
-	for module in proxy fastcgi scgi uwsgi; do
-		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
-	done
-
-	keepdir /var/log/nginx ${keepdir_list}
-
-	# this solves a problem with SELinux where nginx doesn't see the directories
-	# as root and tries to create them as nginx
-	fperms 0750 "${NGINX_HOME_TMP}"
-	fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
-	fperms 0700 ${keepdir_list}
-	fowners ${PN}:${PN} ${keepdir_list}
-
-	fperms 0710 /var/log/nginx
-	fowners 0:${PN} /var/log/nginx
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
-	if use luajit; then
-		pax-mark m "${ED%/}/usr/sbin/nginx"
-	fi
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/ || die
-		emake DESTDIR="${D}" INSTALLDIRS=vendor
-		perl_delete_localpod
-		cd "${S}" || die
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
-	fi
-
-	if use nginx_modules_http_fancyindex; then
-		docinto ${HTTP_FANCYINDEX_MODULE_P}
-		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_lua; then
-		docinto ${HTTP_LUA_MODULE_P}
-		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_pam; then
-		docinto ${HTTP_AUTH_PAM_MODULE_P}
-		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
-	fi
-
-	if use nginx_modules_http_upstream_check; then
-		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
-		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
-	fi
-
-	if use nginx_modules_http_naxsi; then
-		insinto /etc/nginx
-		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
-	fi
-
-	if use rtmp; then
-		docinto ${RTMP_MODULE_P}
-		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
-	fi
-
-	if use nginx_modules_http_dav_ext; then
-		docinto ${HTTP_DAV_EXT_MODULE_P}
-		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
-	fi
-
-	if use nginx_modules_http_echo; then
-		docinto ${HTTP_ECHO_MODULE_P}
-		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_security; then
-		docinto ${HTTP_SECURITY_MODULE_P}
-		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
-	fi
-
-	if use nginx_modules_http_push_stream; then
-		docinto ${HTTP_PUSH_STREAM_MODULE_P}
-		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
-	fi
-
-	if use nginx_modules_http_sticky; then
-		docinto ${HTTP_STICKY_MODULE_P}
-		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
-	fi
-
-	if use nginx_modules_http_memc; then
-		docinto ${HTTP_MEMC_MODULE_P}
-		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
-	fi
-
-	if use nginx_modules_http_auth_ldap; then
-		docinto ${HTTP_LDAP_MODULE_P}
-		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-
-	if use nginx_modules_http_spdy; then
-		ewarn ""
-		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
-		ewarn "Update your configs and package.use accordingly."
-	fi
-
-	if use nginx_modules_http_lua; then
-		ewarn ""
-		ewarn "While you can build lua 3rd party module against ${P}"
-		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
-		ewarn "officially supported target yet. You are on your own."
-		ewarn "Expect runtime failures, memory leaks and other problems!"
-	fi
-
-	if use nginx_modules_http_lua && use http2; then
-		ewarn ""
-		ewarn "Lua 3rd party module author warns against using ${P} with"
-		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
-	fi
-
-	local _n_permission_layout_checks=0
-	local _has_to_adjust_permissions=0
-	local _has_to_show_permission_warning=0
-
-	# Defaults to 1 to inform people doing a fresh installation
-	# that we ship modified {scgi,uwsgi,fastcgi}_params files
-	local _has_to_show_httpoxy_mitigation_notice=1
-
-	local _replacing_version=
-	for _replacing_version in ${REPLACING_VERSIONS}; do
-		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
-		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
-			# Should never happen:
-			# Package is abusing slots but doesn't allow multiple parallel installations.
-			# If we run into this situation it is unsafe to automatically adjust any
-			# permission...
-			_has_to_show_permission_warning=1
-
-			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
-				"You will have to adjust permissions on your own."
-
-			break
-		fi
-
-		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
-		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
-		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
-		# This was before we introduced multiple nginx versions so we
-		# do not need to distinguish between stable and mainline
-		local _need_to_fix_CVE2013_0337=1
-
-		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
-			# We are updating an installation which should already be fixed
-			_need_to_fix_CVE2013_0337=0
-			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
-		else
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
-		fi
-
-		# Do we need to inform about HTTPoxy mitigation?
-		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_show_httpoxy_mitigation_notice=1
-			debug-print "Need to inform about HTTPoxy mitigation!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.1-r2"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.3-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that the user has
-					# already seen the HTTPoxy mitigation notice because he/she is doing
-					# an update from previous version where we have already shown
-					# the warning. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation where we already informed
-				# that we are mitigating HTTPoxy per default
-				_has_to_show_httpoxy_mitigation_notice=0
-				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
-			else
-				_has_to_show_httpoxy_mitigation_notice=1
-				debug-print "Need to inform about HTTPoxy mitigation!"
-			fi
-		fi
-
-		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
-		# All branches up to 1.11 are affected
-		local _need_to_fix_CVE2016_1247=1
-
-		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
-			# Updating from <1.10
-			_has_to_adjust_permissions=1
-			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-		else
-			# Updating from >=1.10
-			local _fixed_in_pvr=
-			case "${_replacing_version_branch}" in
-				"1.10")
-					_fixed_in_pvr="1.10.2-r3"
-					;;
-				"1.11")
-					_fixed_in_pvr="1.11.6-r1"
-					;;
-				*)
-					# This should be any future branch.
-					# If we run this code it is safe to assume that we have already
-					# adjusted permissions or were never affected because user is
-					# doing an update from previous version which was safe or did
-					# the adjustments. Otherwise, we wouldn't hit this code path ...
-					_fixed_in_pvr=
-			esac
-
-			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
-				# We are updating an installation which should already be adjusted
-				# or which was never affected
-				_need_to_fix_CVE2016_1247=0
-				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
-			else
-				_has_to_adjust_permissions=1
-				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
-			fi
-		fi
-	done
-
-	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
-		# We do not DIE when chmod/chown commands are failing because
-		# package is already merged on user's system at this stage
-		# and we cannot retry without losing the information that
-		# the existing installation needs to adjust permissions.
-		# Instead we are going to a show a big warning ...
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The world-readable bit (if set) has been removed from the"
-			ewarn "following directories to mitigate a security bug"
-			ewarn "(CVE-2013-0337, bug #458726):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
-			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
-				_has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
-			ewarn ""
-			ewarn "The permissions on the following directory have been reset in"
-			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
-			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn ""
-			ewarn "Check if this is correct for your setup before restarting nginx!"
-			ewarn "Also ensure that no other log directory used by any of your"
-			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-			ewarn "used by nginx can be abused to escalate privileges!"
-			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-		fi
-
-		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
-			# Should never happen ...
-			ewarn ""
-			ewarn "*************************************************************"
-			ewarn "***************         W A R N I N G         ***************"
-			ewarn "*************************************************************"
-			ewarn "The one-time only attempt to adjust permissions of the"
-			ewarn "existing nginx installation failed. Be aware that we will not"
-			ewarn "try to adjust the same permissions again because now you are"
-			ewarn "using a nginx version where we expect that the permissions"
-			ewarn "are already adjusted or that you know what you are doing and"
-			ewarn "want to keep custom permissions."
-			ewarn ""
-		fi
-	fi
-
-	# Sanity check for CVE-2016-1247
-	# Required to warn users who received the warning above and thought
-	# they could fix it by unmerging and re-merging the package or have
-	# unmerged a affected installation on purpose in the past leaving
-	# /var/log/nginx on their system due to keepdir/non-empty folder
-	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
-	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
-	if [ $? -eq 0 ] ; then
-		# Cleanup -- no reason to die here!
-		rm -f "${_sanity_check_testfile}"
-
-		ewarn ""
-		ewarn "*************************************************************"
-		ewarn "***************         W A R N I N G         ***************"
-		ewarn "*************************************************************"
-		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
-		ewarn "(bug #605008) because nginx user is able to create files in"
-		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
-		ewarn ""
-		ewarn "Also ensure that no other log directory used by any of your"
-		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
-		ewarn "used by nginx can be abused to escalate privileges!"
-	fi
-
-	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
-		# HTTPoxy mitigation
-		ewarn ""
-		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
-		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
-		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
-		ewarn "are sourcing one of the default"
-		ewarn ""
-		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
-		ewarn "  - 'scgi_params'"
-		ewarn "  - 'uwsgi_params'"
-		ewarn ""
-		ewarn "files in your server block(s)."
-		ewarn ""
-		ewarn "If this is causing any problems for you make sure that you are sourcing the"
-		ewarn "default parameters _before_ you set your own values."
-		ewarn "If you are relying on user-supplied proxy values you have to remove the"
-		ewarn "correlating lines from the file(s) mentioned above."
-		ewarn ""
-	fi
-}
diff --git a/www-servers/nginx/nginx-1.15.12-r1.ebuild b/www-servers/nginx/nginx-1.17.0.ebuild
similarity index 99%
rename from www-servers/nginx/nginx-1.15.12-r1.ebuild
rename to www-servers/nginx/nginx-1.17.0.ebuild
index 1ef25b421414..2985eb0886b4 100644
--- a/www-servers/nginx/nginx-1.15.12-r1.ebuild
+++ b/www-servers/nginx/nginx-1.17.0.ebuild
@@ -59,7 +59,7 @@ HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v
 HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
 
 # http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.14"
+HTTP_LUA_MODULE_PV="0.10.15"
 HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
 HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
 HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.3.1"
+NJS_MODULE_PV="0.3.2"
 NJS_MODULE_P="njs-${NJS_MODULE_PV}"
 NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
 NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5a6f987dff03..ac71126340b2 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index f79318730321..5fbf559899fc 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1 +1,2 @@
 DIST luit-1.1.1.tar.bz2 140044 BLAKE2B 5abf18955b753182198b4ebfa981e34b57707c578f1093f855e201b69b04b6a70fe189c0dcda43338a07d47f892eb3acb8278aba0e739d00e3cf164806d56ca4 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6
+DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
new file mode 100644
index 000000000000..a9f4e3f9811a
--- /dev/null
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
+HOMEPAGE="https://invisible-island.net/luit/"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/groff"
+
+src_configure() {
+	econf --disable-fontenc --enable-iconv
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 212c82efa6ed..4e39359f0242 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
index de820366ee64..fc5ff1b08f97 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d91f03a0a453..e3667541d20b 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index a969ba2d4885..8845a7934304 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index e8f40638bef8..999c99033f6f 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index 67921d696b43..5ec5d238dda2 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="debug"
 
 BDEPEND="
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
new file mode 100644
index 000000000000..3dafb9aa6b0c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
@@ -0,0 +1,26 @@
+From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001
+From: Jim Broadus <jbroadus@xevo.com>
+Date: Wed, 2 Jan 2019 17:37:40 -0800
+Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a
+ security level concept. Only level 0 allows the use of unauthenticated cipher
+ suites such as ADH.
+
+---
+ src/sslhelper.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 1a3e7474..04c2e273 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) {
+ 	if (ssl_client_mode) {
+ 		return 1;
+ 	}
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++	/* Security level must be set to 0 for unauthenticated suites. */
++	SSL_CTX_set_security_level(ctx, 0);
++#endif
+ 	if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) {
+ 		return 0;
+ 	}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
similarity index 66%
rename from x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
rename to x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
index b4e3e583f68f..0fdf9aed66fa 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -1,28 +1,27 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools vcs-snapshot
+EAPI=7
 
-DESCRIPTION="A VNC server for real X displays"
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
 HOMEPAGE="https://libvnc.github.io/"
 SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
-	>=net-libs/libvncserver-0.9.8[ssl?]
+	>=net-libs/libvncserver-0.9.8[ssl]
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXext
 	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	xcomposite? ( x11-libs/libXcomposite )
 	xdamage? ( x11-libs/libXdamage )
 	xfixes? ( x11-libs/libXfixes )
@@ -35,11 +34,13 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXt
 "
 # https://bugzilla.redhat.com/show_bug.cgi?id=920554
-RDEPEND="dev-lang/tk:0"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/tk:0
+"
 
 PATCHES=(
-	# https://github.com/LibVNC/x11vnc/issues/86
-	"${FILESDIR}"/${P}-crypto.patch
+	"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+	"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
 )
 
 src_prepare() {
@@ -49,15 +50,16 @@ src_prepare() {
 
 src_configure() {
 	# --without-v4l because of missing video4linux 2.x support wrt #389079
+	# --with-crypto --with-ssl because USE=-ssl is broken (bug #686494)
 	econf \
+		--with-crypto \
+		--with-ssl \
 		--without-v4l \
 		--without-xkeyboard \
 		--without-fbpm \
 		--without-dpms \
 		$(use_with crypt) \
 		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
 		$(use_with xcomposite) \
 		$(use_with xdamage) \
 		$(use_with xfixes) \
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
deleted file mode 100644
index fdb0b5c8392a..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	xinerama? ( x11-libs/libXinerama )
-	zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --without-v4l because of missing video4linux 2.x support wrt #389079
-	econf \
-		--without-v4l \
-		$(use_with crypt) \
-		$(use_with fbcon fbdev) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with xinerama) \
-		$(use_with zeroconf avahi)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
-	newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index e85b85739175..80f798df94d5 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
index d8ddf1b7c947..aafffa0427b1 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index dc0083a6811d..20ec83f00a1d 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index fe91a567097a..46b3d3c8e60b 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,2 +1 @@
-DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
diff --git a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild b/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
deleted file mode 100644
index 9e7dbed74f62..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.22.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
-
-E_CONF_MODS=(
-	applications bindings dialogs display
-	interaction intl menus paths
-	performance randr shelves theme
-	window-manipulation window-remembers
-)
-
-E_NORM_MODS=(
-	appmenu backlight battery bluez4
-	clock conf cpufreq everything
-	fileman fileman-opinfo gadman geolocation
-	ibar ibox lokker luncher
-	mixer msgbus music-control notification
-	packagekit pager pager-plain quickaccess
-	shot start syscon sysinfo
-	systray tasks teamwork temperature
-	tiling time vkbd winlist
-	wireless wizard wl-buffer wl-desktop-shell
-	wl-drm wl-text-input wl-weekeyboard wl-wl
-	wl-x11 xkbswitch xwayland
-)
-
-IUSE_E_MODULES=(
-	${E_CONF_MODS[@]/#/enlightenment_modules_conf-}
-	${E_NORM_MODS[@]/#/enlightenment_modules_}
-)
-
-IUSE="acpi connman doc nls pam systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}"
-
-RDEPEND="
-	>=dev-libs/efl-1.20.5[eet,X]
-	virtual/udev
-	x11-libs/libXext
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	x11-misc/xkeyboard-config
-	acpi? ( sys-power/acpid )
-	connman? ( net-misc/connman )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd )
-	udisks? ( sys-fs/udisks:2 )
-	wayland? (
-		=dev-libs/efl-1.20*[drm,wayland]
-		>=dev-libs/wayland-1.12.0
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-sysactions=false
-		-D mount-udisks=$(usex udisks true false)
-		-D connman=$(usex connman true false)
-		-D nls=$(usex nls true false)
-		-D pam=$(usex pam true false)
-		-D systemd=$(usex systemd true false)
-		-D wayland=$(usex wayland true false)
-	)
-
-	local u c
-	for u in ${IUSE_E_MODULES[@]} ; do
-		c=${u#enlightenment_modules_}
-
-		case ${c} in
-		wl-*|xwayland)
-			if ! use wayland ; then
-				emesonargs+=( -D ${c}=false )
-				continue
-			fi
-
-		;;
-		esac
-
-		emesonargs+=( -D ${c}=$(usex ${u} true false) )
-
-	done
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	if use doc ; then
-		local HTML_DOCS=( doc/. )
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}